From d52d44dd2bafcb324d08e4866cbad72816e70f6d Mon Sep 17 00:00:00 2001 From: Marco Acierno Date: Sat, 18 Jan 2025 19:58:25 +0100 Subject: [PATCH 1/6] Build on Github ARM --- .github/workflows/build-backend.yml | 2 +- .github/workflows/build-base-pretix.yml | 2 +- .github/workflows/build-frontend.yml | 2 +- .github/workflows/build-pretix.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-backend.yml b/.github/workflows/build-backend.yml index 066e0514ea..67d1bcb0c9 100644 --- a/.github/workflows/build-backend.yml +++ b/.github/workflows/build-backend.yml @@ -8,7 +8,7 @@ on: jobs: build: name: Build - runs-on: [self-hosted] + runs-on: ubuntu-24.04-arm steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/build-base-pretix.yml b/.github/workflows/build-base-pretix.yml index d4b30095f8..edadcbe0cd 100644 --- a/.github/workflows/build-base-pretix.yml +++ b/.github/workflows/build-base-pretix.yml @@ -13,7 +13,7 @@ on: jobs: build: name: Build - runs-on: [self-hosted] + runs-on: ubuntu-24.04-arm permissions: contents: read packages: write diff --git a/.github/workflows/build-frontend.yml b/.github/workflows/build-frontend.yml index c71008f76e..a39d29c4d7 100644 --- a/.github/workflows/build-frontend.yml +++ b/.github/workflows/build-frontend.yml @@ -11,7 +11,7 @@ on: jobs: build: name: Build - runs-on: [self-hosted] + runs-on: ubuntu-24.04-arm steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/build-pretix.yml b/.github/workflows/build-pretix.yml index b8ed77d6ce..93d079fbf3 100644 --- a/.github/workflows/build-pretix.yml +++ b/.github/workflows/build-pretix.yml @@ -8,7 +8,7 @@ on: jobs: build: name: Build pretix - runs-on: [self-hosted] + runs-on: ubuntu-24.04-arm steps: - uses: actions/checkout@v4 with: From cb62669d71b4b5bb6950223db6099d358652dc3d Mon Sep 17 00:00:00 2001 From: Marco Acierno Date: Sat, 18 Jan 2025 19:59:37 +0100 Subject: [PATCH 2/6] test changes --- backend/Dockerfile | 1 + frontend/Dockerfile | 1 + pretix/Dockerfile | 1 + 3 files changed, 3 insertions(+) diff --git a/backend/Dockerfile b/backend/Dockerfile index 32a237e27d..9a4c81780b 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -87,3 +87,4 @@ RUN mkdir -p assets && .venv/bin/python manage.py collectstatic --noinput ENTRYPOINT ["/home/app/.venv/bin/gunicorn"] CMD [ "pycon.wsgi" ] +#test diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 6ac204d945..361b4d4f4c 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -51,3 +51,4 @@ ENV PORT=3000 ENV HOSTNAME="0.0.0.0" ENV NEXT_MANUAL_SIG_HANDLE=1 CMD ["node", "server.js"] +#test diff --git a/pretix/Dockerfile b/pretix/Dockerfile index 5a78ef7716..9354329f65 100644 --- a/pretix/Dockerfile +++ b/pretix/Dockerfile @@ -13,3 +13,4 @@ RUN cd /pretix/src && DATABASE_HOST=demo make compress ENTRYPOINT ["pretix"] CMD [ "all" ] +#test From 24febb52d4bb362b1b987eb057c2232b2385809d Mon Sep 17 00:00:00 2001 From: Marco Acierno Date: Sat, 18 Jan 2025 20:21:02 +0100 Subject: [PATCH 3/6] Revert "test changes" This reverts commit cb62669d71b4b5bb6950223db6099d358652dc3d. --- backend/Dockerfile | 1 - frontend/Dockerfile | 1 - pretix/Dockerfile | 1 - 3 files changed, 3 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 9a4c81780b..32a237e27d 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -87,4 +87,3 @@ RUN mkdir -p assets && .venv/bin/python manage.py collectstatic --noinput ENTRYPOINT ["/home/app/.venv/bin/gunicorn"] CMD [ "pycon.wsgi" ] -#test diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 361b4d4f4c..6ac204d945 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -51,4 +51,3 @@ ENV PORT=3000 ENV HOSTNAME="0.0.0.0" ENV NEXT_MANUAL_SIG_HANDLE=1 CMD ["node", "server.js"] -#test diff --git a/pretix/Dockerfile b/pretix/Dockerfile index 9354329f65..5a78ef7716 100644 --- a/pretix/Dockerfile +++ b/pretix/Dockerfile @@ -13,4 +13,3 @@ RUN cd /pretix/src && DATABASE_HOST=demo make compress ENTRYPOINT ["pretix"] CMD [ "all" ] -#test From b9923f92d6aa687b0b4cecfff060624be40dd096 Mon Sep 17 00:00:00 2001 From: Marco Acierno Date: Sat, 18 Jan 2025 20:29:16 +0100 Subject: [PATCH 4/6] change update --- .github/workflows/build-backend.yml | 4 ++-- .github/workflows/build-base-pretix.yml | 4 ++-- .github/workflows/build-frontend.yml | 4 ++-- .github/workflows/build-pretix.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-backend.yml b/.github/workflows/build-backend.yml index 67d1bcb0c9..207bd45f0c 100644 --- a/.github/workflows/build-backend.yml +++ b/.github/workflows/build-backend.yml @@ -36,6 +36,6 @@ jobs: provenance: false push: true tags: ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.eu-central-1.amazonaws.com/pythonit/pycon-backend:arm-${{ inputs.githash }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache + cache-from: type=gha + cache-to: type=gha,mode=max platforms: linux/arm64 diff --git a/.github/workflows/build-base-pretix.yml b/.github/workflows/build-base-pretix.yml index edadcbe0cd..11785a586e 100644 --- a/.github/workflows/build-base-pretix.yml +++ b/.github/workflows/build-base-pretix.yml @@ -40,6 +40,6 @@ jobs: provenance: false push: true tags: ghcr.io/pythonitalia/pycon/base-pretix:${{ inputs.version }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache + cache-from: type=gha + cache-to: type=gha,mode=max platforms: linux/arm64 diff --git a/.github/workflows/build-frontend.yml b/.github/workflows/build-frontend.yml index a39d29c4d7..5feae9e1c4 100644 --- a/.github/workflows/build-frontend.yml +++ b/.github/workflows/build-frontend.yml @@ -51,8 +51,8 @@ jobs: provenance: false push: true tags: ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.eu-central-1.amazonaws.com/pythonit/${{ inputs.tf_environment }}-pycon-frontend:${{ inputs.githash }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache + cache-from: type=gha + cache-to: type=gha,mode=max platforms: linux/arm64 build-args: | API_URL_SERVER=https://${{ fromJSON('["pastaporto-", ""]')[github.ref == 'refs/heads/main'] }}admin.pycon.it diff --git a/.github/workflows/build-pretix.yml b/.github/workflows/build-pretix.yml index 93d079fbf3..3e05568a07 100644 --- a/.github/workflows/build-pretix.yml +++ b/.github/workflows/build-pretix.yml @@ -34,6 +34,6 @@ jobs: provenance: false push: true tags: ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.eu-central-1.amazonaws.com/pythonit/pretix:arm-${{ inputs.githash }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache + cache-from: type=gha + cache-to: type=gha,mode=max platforms: linux/arm64 From 9a9fe7e49cc18fa78191090790da8b9560ea70d9 Mon Sep 17 00:00:00 2001 From: Marco Acierno Date: Sat, 18 Jan 2025 20:29:26 +0100 Subject: [PATCH 5/6] Revert "Revert "test changes"" This reverts commit 24febb52d4bb362b1b987eb057c2232b2385809d. --- backend/Dockerfile | 1 + frontend/Dockerfile | 1 + pretix/Dockerfile | 1 + 3 files changed, 3 insertions(+) diff --git a/backend/Dockerfile b/backend/Dockerfile index 32a237e27d..9a4c81780b 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -87,3 +87,4 @@ RUN mkdir -p assets && .venv/bin/python manage.py collectstatic --noinput ENTRYPOINT ["/home/app/.venv/bin/gunicorn"] CMD [ "pycon.wsgi" ] +#test diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 6ac204d945..361b4d4f4c 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -51,3 +51,4 @@ ENV PORT=3000 ENV HOSTNAME="0.0.0.0" ENV NEXT_MANUAL_SIG_HANDLE=1 CMD ["node", "server.js"] +#test diff --git a/pretix/Dockerfile b/pretix/Dockerfile index 5a78ef7716..9354329f65 100644 --- a/pretix/Dockerfile +++ b/pretix/Dockerfile @@ -13,3 +13,4 @@ RUN cd /pretix/src && DATABASE_HOST=demo make compress ENTRYPOINT ["pretix"] CMD [ "all" ] +#test From ca81a965ccc7674e631e17a0d78f9d73133b3218 Mon Sep 17 00:00:00 2001 From: Marco Acierno Date: Sat, 18 Jan 2025 20:41:38 +0100 Subject: [PATCH 6/6] Revert "Revert "Revert "test changes""" This reverts commit 9a9fe7e49cc18fa78191090790da8b9560ea70d9. --- backend/Dockerfile | 1 - frontend/Dockerfile | 1 - pretix/Dockerfile | 1 - 3 files changed, 3 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 9a4c81780b..32a237e27d 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -87,4 +87,3 @@ RUN mkdir -p assets && .venv/bin/python manage.py collectstatic --noinput ENTRYPOINT ["/home/app/.venv/bin/gunicorn"] CMD [ "pycon.wsgi" ] -#test diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 361b4d4f4c..6ac204d945 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -51,4 +51,3 @@ ENV PORT=3000 ENV HOSTNAME="0.0.0.0" ENV NEXT_MANUAL_SIG_HANDLE=1 CMD ["node", "server.js"] -#test diff --git a/pretix/Dockerfile b/pretix/Dockerfile index 9354329f65..5a78ef7716 100644 --- a/pretix/Dockerfile +++ b/pretix/Dockerfile @@ -13,4 +13,3 @@ RUN cd /pretix/src && DATABASE_HOST=demo make compress ENTRYPOINT ["pretix"] CMD [ "all" ] -#test