From 668fec9b4eab0dd1c1bbf76c2339ce87d59bc337 Mon Sep 17 00:00:00 2001 From: Webysther Sperandio Date: Thu, 16 Nov 2023 05:08:37 +0100 Subject: [PATCH 01/14] Create docker-container-publish.yml --- .../workflows /docker-container-publish.yml | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows /docker-container-publish.yml diff --git a/.github/workflows /docker-container-publish.yml b/.github/workflows /docker-container-publish.yml new file mode 100644 index 0000000..8a17ffb --- /dev/null +++ b/.github/workflows /docker-container-publish.yml @@ -0,0 +1,45 @@ +name: Publish Container Image + +on: push + +jobs: + build: + runs-on: node:18.16.0 + steps: + - + name: Checkout + uses: actions/checkout@v3 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Login to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v4 + with: + context: ./deploy/prod + push: true + provenance: true + sbom: true + cache-from: type=gha + cache-to: type=gha,mode=max + tags: ${{ steps.meta.outputs.tags }} + platforms: | + linux/amd64 + linux/arm64 + labels: ${{ steps.meta.outputs.labels }} From 47fc9f4874be61df0e79bae851c9cd661355876e Mon Sep 17 00:00:00 2001 From: Webysther Sperandio Date: Thu, 16 Nov 2023 05:11:24 +0100 Subject: [PATCH 02/14] Update docker-container-publish.yml --- .github/workflows /docker-container-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows /docker-container-publish.yml b/.github/workflows /docker-container-publish.yml index 8a17ffb..994bac0 100644 --- a/.github/workflows /docker-container-publish.yml +++ b/.github/workflows /docker-container-publish.yml @@ -32,7 +32,7 @@ jobs: name: Build and push uses: docker/build-push-action@v4 with: - context: ./deploy/prod + context: ./deploy/prod/ push: true provenance: true sbom: true From ac2bdb7a90aa8f5a0593ef9a6560092f9fd0740c Mon Sep 17 00:00:00 2001 From: Webysther Sperandio Date: Thu, 16 Nov 2023 05:11:35 +0100 Subject: [PATCH 03/14] Create main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1 @@ + From 27c4333175da330af8a141554a23d34c650c9b97 Mon Sep 17 00:00:00 2001 From: Webysther Sperandio Date: Thu, 16 Nov 2023 05:12:14 +0100 Subject: [PATCH 04/14] Delete .github/workflows /docker-container-publish.yml --- .../workflows /docker-container-publish.yml | 45 ------------------- 1 file changed, 45 deletions(-) delete mode 100644 .github/workflows /docker-container-publish.yml diff --git a/.github/workflows /docker-container-publish.yml b/.github/workflows /docker-container-publish.yml deleted file mode 100644 index 994bac0..0000000 --- a/.github/workflows /docker-container-publish.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Publish Container Image - -on: push - -jobs: - build: - runs-on: node:18.16.0 - steps: - - - name: Checkout - uses: actions/checkout@v3 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v4 - with: - context: ./deploy/prod/ - push: true - provenance: true - sbom: true - cache-from: type=gha - cache-to: type=gha,mode=max - tags: ${{ steps.meta.outputs.tags }} - platforms: | - linux/amd64 - linux/arm64 - labels: ${{ steps.meta.outputs.labels }} From da5fa2b400e585f8b34fcb9e60f5d638aa026537 Mon Sep 17 00:00:00 2001 From: Webysther Sperandio Date: Thu, 16 Nov 2023 05:12:49 +0100 Subject: [PATCH 05/14] Update and rename main.yml to docker-container-publish.yml --- .../workflows/docker-container-publish.yml | 46 +++++++++++++++++++ .github/workflows/main.yml | 1 - 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/docker-container-publish.yml delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/docker-container-publish.yml b/.github/workflows/docker-container-publish.yml new file mode 100644 index 0000000..8106295 --- /dev/null +++ b/.github/workflows/docker-container-publish.yml @@ -0,0 +1,46 @@ + +name: Publish Container Image + +on: push + +jobs: + build: + runs-on: node:18.16.0 + steps: + - + name: Checkout + uses: actions/checkout@v3 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Login to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v4 + with: + context: ./deploy/prod/ + push: true + provenance: true + sbom: true + cache-from: type=gha + cache-to: type=gha,mode=max + tags: ${{ steps.meta.outputs.tags }} + platforms: | + linux/amd64 + linux/arm64 + labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 8b13789..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1 +0,0 @@ - From a32610bfd0f8a16629a2ff26323fd3dc1e6a1696 Mon Sep 17 00:00:00 2001 From: Webysther Sperandio Date: Thu, 16 Nov 2023 05:15:35 +0100 Subject: [PATCH 06/14] Update and rename .env to .env.example --- .env | 8 -------- .env.example | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 .env create mode 100644 .env.example diff --git a/.env b/.env deleted file mode 100644 index 1657f3a..0000000 --- a/.env +++ /dev/null @@ -1,8 +0,0 @@ -STORAGE_TYPE=local -STORAGE_LOCAL_PATH=.local-storage - -# STORAGE_TYPE= -# STORAGE_S3_REGION= -# STORAGE_S3_NAME= -# AWS_ACCESS_KEY_ID= -# AWS_SECRET_ACCESS_KEY= diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..fdd9701 --- /dev/null +++ b/.env.example @@ -0,0 +1,8 @@ +STORAGE_TYPE=local|S3 +STORAGE_LOCAL_PATH=.local-storage + +# STORAGE_TYPE S3 +STORAGE_S3_REGION= +STORAGE_S3_NAME= +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= From 94ff69cbcdb71d467cb9ccc30ee85264f7c2a61b Mon Sep 17 00:00:00 2001 From: Webysther Sperandio Date: Thu, 16 Nov 2023 05:17:38 +0100 Subject: [PATCH 07/14] Update docker-container-publish.yml --- .github/workflows/docker-container-publish.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/docker-container-publish.yml b/.github/workflows/docker-container-publish.yml index 8106295..be31ce2 100644 --- a/.github/workflows/docker-container-publish.yml +++ b/.github/workflows/docker-container-publish.yml @@ -5,7 +5,7 @@ on: push jobs: build: - runs-on: node:18.16.0 + runs-on: node:18 steps: - name: Checkout @@ -16,12 +16,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry uses: docker/login-action@v2 From 7ff61f7d6ed2232698dc9ce8d22c04d4ff08196b Mon Sep 17 00:00:00 2001 From: Webysther Sperandio Date: Thu, 16 Nov 2023 05:28:35 +0100 Subject: [PATCH 08/14] Rename deploy/prod/Dockerfile to Dockerfile --- deploy/prod/Dockerfile => Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename deploy/prod/Dockerfile => Dockerfile (100%) diff --git a/deploy/prod/Dockerfile b/Dockerfile similarity index 100% rename from deploy/prod/Dockerfile rename to Dockerfile From 0a4a3d84e5b2f331f232f6106503d586eaa2a297 Mon Sep 17 00:00:00 2001 From: Webysther Sperandio Date: Thu, 16 Nov 2023 05:28:53 +0100 Subject: [PATCH 09/14] Update docker-container-publish.yml --- .github/workflows/docker-container-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-container-publish.yml b/.github/workflows/docker-container-publish.yml index be31ce2..5723fe7 100644 --- a/.github/workflows/docker-container-publish.yml +++ b/.github/workflows/docker-container-publish.yml @@ -27,7 +27,7 @@ jobs: name: Build and push uses: docker/build-push-action@v4 with: - context: ./deploy/prod/ + context: . push: true provenance: true sbom: true From d905eec6377542bdf110e158098fdbc215961249 Mon Sep 17 00:00:00 2001 From: Webysther Sperandio Date: Thu, 16 Nov 2023 05:30:01 +0100 Subject: [PATCH 10/14] Update docker-container-publish.yml --- .github/workflows/docker-container-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-container-publish.yml b/.github/workflows/docker-container-publish.yml index 5723fe7..183d94f 100644 --- a/.github/workflows/docker-container-publish.yml +++ b/.github/workflows/docker-container-publish.yml @@ -5,7 +5,7 @@ on: push jobs: build: - runs-on: node:18 + runs-on: ubuntu-22.04 steps: - name: Checkout From f0af17ca2deaae69040cf878c992b7b8143cc502 Mon Sep 17 00:00:00 2001 From: Webysther Sperandio Date: Thu, 16 Nov 2023 05:31:06 +0100 Subject: [PATCH 11/14] Update docker-container-publish.yml --- .github/workflows/docker-container-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-container-publish.yml b/.github/workflows/docker-container-publish.yml index 183d94f..5f1231b 100644 --- a/.github/workflows/docker-container-publish.yml +++ b/.github/workflows/docker-container-publish.yml @@ -33,7 +33,7 @@ jobs: sbom: true cache-from: type=gha cache-to: type=gha,mode=max - tags: ${{ steps.meta.outputs.tags }} + tags: latest platforms: | linux/amd64 linux/arm64 From f93370cb122107e086b8bca0bf400d484e01065a Mon Sep 17 00:00:00 2001 From: Webysther Sperandio Date: Thu, 16 Nov 2023 05:43:43 +0100 Subject: [PATCH 12/14] Update docker-container-publish.yml --- .github/workflows/docker-container-publish.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/docker-container-publish.yml b/.github/workflows/docker-container-publish.yml index 5f1231b..f48d80a 100644 --- a/.github/workflows/docker-container-publish.yml +++ b/.github/workflows/docker-container-publish.yml @@ -34,7 +34,4 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max tags: latest - platforms: | - linux/amd64 - linux/arm64 - labels: ${{ steps.meta.outputs.labels }} + platforms: linux/amd64 From 059251fd2415ee1749699e674defef907eebfe54 Mon Sep 17 00:00:00 2001 From: Webysther Sperandio Date: Thu, 16 Nov 2023 05:49:53 +0100 Subject: [PATCH 13/14] Update docker-container-publish.yml --- .github/workflows/docker-container-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-container-publish.yml b/.github/workflows/docker-container-publish.yml index f48d80a..3db5e16 100644 --- a/.github/workflows/docker-container-publish.yml +++ b/.github/workflows/docker-container-publish.yml @@ -33,5 +33,5 @@ jobs: sbom: true cache-from: type=gha cache-to: type=gha,mode=max - tags: latest + tags: ${{ github.repository_owner }}/favicon:latest platforms: linux/amd64 From e73653e580dddd50ad863ecd833828de7b4c50a6 Mon Sep 17 00:00:00 2001 From: Webysther Sperandio Date: Thu, 16 Nov 2023 05:53:32 +0100 Subject: [PATCH 14/14] Update docker-container-publish.yml --- .github/workflows/docker-container-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-container-publish.yml b/.github/workflows/docker-container-publish.yml index 3db5e16..786a6f2 100644 --- a/.github/workflows/docker-container-publish.yml +++ b/.github/workflows/docker-container-publish.yml @@ -33,5 +33,5 @@ jobs: sbom: true cache-from: type=gha cache-to: type=gha,mode=max - tags: ${{ github.repository_owner }}/favicon:latest + tags: ghcr.io/${{ github.repository_owner }}/favicon:latest platforms: linux/amd64