From 715a95a264a140cbf92da00971e5cdc17aa5f502 Mon Sep 17 00:00:00 2001 From: nemanjam Date: Fri, 30 Aug 2024 15:56:05 +0200 Subject: [PATCH] separate site_url for x68 and arm --- .github/workflows/default__build-push-docker.yml | 14 +++++++++++++- docs/working-notes/todo3.md | 6 +++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/default__build-push-docker.yml b/.github/workflows/default__build-push-docker.yml index 9d566ac..96e0255 100644 --- a/.github/workflows/default__build-push-docker.yml +++ b/.github/workflows/default__build-push-docker.yml @@ -13,13 +13,17 @@ on: env: IMAGE_NAME: ${{ github.event.repository.name }} - SITE_URL: 'https://nmc-docker.arm1.nemanjamitic.com' + SITE_URL_AMD64: 'https://nmc-docker.arm1.nemanjamitic.com' + SITE_URL_ARM64: 'https://nmc-docker.local.nemanjamitic.com' PLAUSIBLE_SCRIPT_URL: 'https://plausible.arm1.nemanjamitic.com/js/script.js' jobs: build: name: Build and push docker image runs-on: ubuntu-latest + strategy: + matrix: + platform: [linux/amd64, linux/arm64] steps: - name: Checkout @@ -58,6 +62,14 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Set environment variables for each architecture + run: | + if [[ "${{ matrix.platform }}" == "linux/amd64" ]]; then + echo "SITE_URL=${{ env.SITE_URL_AMD64 }}" >> $GITHUB_ENV + elif [[ "${{ matrix.platform }}" == "linux/arm64" ]]; then + echo "SITE_URL=${{ env.SITE_URL_ARM64 }}" >> $GITHUB_ENV + fi + - name: Build and push Docker image uses: docker/build-push-action@v5 with: diff --git a/docs/working-notes/todo3.md b/docs/working-notes/todo3.md index 8fd5876..9bd54ec 100644 --- a/docs/working-notes/todo3.md +++ b/docs/working-notes/todo3.md @@ -503,13 +503,13 @@ https://github.com/sindresorhus/github-markdown-css table of contents id links a href open in new tab -fix links page links color for history back view transition + fix links page links color for history back view transition refactor theme script, browserDefaultMode, appDefaultMode, storedMode change meta theme bg color with js, astro-paper replace import config with import.meta.env.VAR -ask about app start handler for log env vars + ask about app start handler for log env vars fix image sizes for gallery and other update bg color meta tag @@ -524,7 +524,7 @@ fix image sizes for gallery and other ----- gallery scroll pagination, blur loading -odvojen ARG_SITE_URL za x86 i arm + odvojen ARG_SITE_URL za x86 i arm folder name for slug and index.mdx and images sentry