From 8a5940ac7326937deec7ec143d4559f5ff42ef5f Mon Sep 17 00:00:00 2001 From: Sergio N Date: Fri, 26 Dec 2025 12:45:35 +0100 Subject: [PATCH 1/9] HOTFIX: add missing minIO env variables to compose example --- compose.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compose.yaml b/compose.yaml index f18bdce..c033179 100644 --- a/compose.yaml +++ b/compose.yaml @@ -22,6 +22,9 @@ services: # AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY} # S3_BUCKET: dev-analysis-entry-storage # S3_REGION: ${S3_REGION} + # S3_ENDPOINT: ${S3_ENDPOINT} + # MINIO_ROOT_USER=${MINIO_ROOT_USER} + # MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD} # ports: # - 3000:3000 From c2b8b7ea1f5802cc41fbaf2755418c354c030442 Mon Sep 17 00:00:00 2001 From: Sergio N Date: Fri, 26 Dec 2025 12:48:40 +0100 Subject: [PATCH 2/9] ADD per-repo docker hub repo Before this change, all tags were being uploaded to the same repo --- .github/workflows/docker:build&push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker:build&push.yaml b/.github/workflows/docker:build&push.yaml index 84209b8..97e1010 100644 --- a/.github/workflows/docker:build&push.yaml +++ b/.github/workflows/docker:build&push.yaml @@ -31,4 +31,4 @@ jobs: context: . platforms: linux/amd64 #,linux/arm64 - Not building for ARM, since ubuntu server is just amd64 push: true - tags: sergion14/uxcaptain:server-${{ github.ref_name }} \ No newline at end of file + tags: sergion14/uxcaptain-server-${{ github.ref_name }} \ No newline at end of file From e0303ee66a28dee892122c5a4d05c6c26d887552 Mon Sep 17 00:00:00 2001 From: Sergio N Date: Fri, 26 Dec 2025 12:59:43 +0100 Subject: [PATCH 3/9] UPDATE docker build & push GH workflow to generate dated tags too We want to do this to ensure that rollbacks exist --- .github/workflows/docker:build&push.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker:build&push.yaml b/.github/workflows/docker:build&push.yaml index 97e1010..ef70c76 100644 --- a/.github/workflows/docker:build&push.yaml +++ b/.github/workflows/docker:build&push.yaml @@ -24,6 +24,15 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - + name: Generate Docker metadata + id: meta + uses: docker/metadata-action@v6 + with: + images: sergion14/uxcaptain-server + tags: | + type=raw,value=${{ github.ref_name }} + type=raw,value=${{ github.ref_name }}-${{ github.sha_short }} - name: Build and push uses: docker/build-push-action@v6 @@ -31,4 +40,4 @@ jobs: context: . platforms: linux/amd64 #,linux/arm64 - Not building for ARM, since ubuntu server is just amd64 push: true - tags: sergion14/uxcaptain-server-${{ github.ref_name }} \ No newline at end of file + tags: ${{ steps.meta.outputs.tags }} \ No newline at end of file From 7dea020fbaa5083b67ac9bc4bd8db344bcec895f Mon Sep 17 00:00:00 2001 From: Sergio N Date: Fri, 26 Dec 2025 13:03:07 +0100 Subject: [PATCH 4/9] ADD temp GH build & push condition to test the workflow --- .github/workflows/docker:build&push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker:build&push.yaml b/.github/workflows/docker:build&push.yaml index ef70c76..26b2162 100644 --- a/.github/workflows/docker:build&push.yaml +++ b/.github/workflows/docker:build&push.yaml @@ -2,7 +2,7 @@ name: Build Webapp Docker image and push to Docker Hub on: push: - branches: [ "latest", "next" ] + branches: [ "latest", "next", "add-docker-releases" ] jobs: docker-build-and-push: From 0e0f2910b08f16af178c1943112452a63ac9298b Mon Sep 17 00:00:00 2001 From: Sergio N Date: Fri, 26 Dec 2025 13:05:15 +0100 Subject: [PATCH 5/9] FIX docker metadata-action version --- .github/workflows/docker:build&push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker:build&push.yaml b/.github/workflows/docker:build&push.yaml index 26b2162..a0c3ce9 100644 --- a/.github/workflows/docker:build&push.yaml +++ b/.github/workflows/docker:build&push.yaml @@ -27,7 +27,7 @@ jobs: - name: Generate Docker metadata id: meta - uses: docker/metadata-action@v6 + uses: docker/metadata-action@v5 with: images: sergion14/uxcaptain-server tags: | From 0d584782e82db15bb816e7131501dfae67545e6f Mon Sep 17 00:00:00 2001 From: Sergio N Date: Fri, 26 Dec 2025 13:08:00 +0100 Subject: [PATCH 6/9] FIX sha not being generated --- .github/workflows/docker:build&push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker:build&push.yaml b/.github/workflows/docker:build&push.yaml index a0c3ce9..12291c9 100644 --- a/.github/workflows/docker:build&push.yaml +++ b/.github/workflows/docker:build&push.yaml @@ -32,7 +32,7 @@ jobs: images: sergion14/uxcaptain-server tags: | type=raw,value=${{ github.ref_name }} - type=raw,value=${{ github.ref_name }}-${{ github.sha_short }} + type=sha,value=${{ github.ref_name }}-${{ github.sha_short }} - name: Build and push uses: docker/build-push-action@v6 From d55e0bafbdeca379892e08f3bba7803dbed5d28b Mon Sep 17 00:00:00 2001 From: Sergio N Date: Fri, 26 Dec 2025 13:15:09 +0100 Subject: [PATCH 7/9] REPLACE sha with date --- .github/workflows/docker:build&push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker:build&push.yaml b/.github/workflows/docker:build&push.yaml index 12291c9..868d66d 100644 --- a/.github/workflows/docker:build&push.yaml +++ b/.github/workflows/docker:build&push.yaml @@ -32,7 +32,7 @@ jobs: images: sergion14/uxcaptain-server tags: | type=raw,value=${{ github.ref_name }} - type=sha,value=${{ github.ref_name }}-${{ github.sha_short }} + type=raw,value=${{ github.ref_name }}-date='%Y-%m-%d' - name: Build and push uses: docker/build-push-action@v6 From c3a86fe85d25dae90d262913834ea64357f848b1 Mon Sep 17 00:00:00 2001 From: Sergio N Date: Fri, 26 Dec 2025 13:21:33 +0100 Subject: [PATCH 8/9] FIX date generation --- .github/workflows/docker:build&push.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker:build&push.yaml b/.github/workflows/docker:build&push.yaml index 868d66d..cd899ea 100644 --- a/.github/workflows/docker:build&push.yaml +++ b/.github/workflows/docker:build&push.yaml @@ -24,6 +24,10 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - + name: Set date + id: date + run: echo "date=$(date +'%Y-%m-%d')" >> "$GITHUB_OUTPUT" - name: Generate Docker metadata id: meta @@ -32,7 +36,7 @@ jobs: images: sergion14/uxcaptain-server tags: | type=raw,value=${{ github.ref_name }} - type=raw,value=${{ github.ref_name }}-date='%Y-%m-%d' + type=raw,value=${{ github.ref_name }}-${{ steps.date.outputs.date }} - name: Build and push uses: docker/build-push-action@v6 From 4369c0358efebdb48a3b85377e2a508b1a963244 Mon Sep 17 00:00:00 2001 From: Sergio N Date: Fri, 26 Dec 2025 13:24:09 +0100 Subject: [PATCH 9/9] REMOVE image generation on non-latest/next branches --- .github/workflows/docker:build&push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker:build&push.yaml b/.github/workflows/docker:build&push.yaml index cd899ea..4bb7093 100644 --- a/.github/workflows/docker:build&push.yaml +++ b/.github/workflows/docker:build&push.yaml @@ -2,7 +2,7 @@ name: Build Webapp Docker image and push to Docker Hub on: push: - branches: [ "latest", "next", "add-docker-releases" ] + branches: [ "latest", "next" ] jobs: docker-build-and-push: