From cab80850cc19ecb1d36bdac3e03c48692e843d2f Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Mon, 1 Apr 2024 16:12:01 +0200 Subject: [PATCH 01/11] feat: add docker build steps --- .gitea/workflows/cd.yaml | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .gitea/workflows/cd.yaml diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml new file mode 100644 index 0000000..7693d87 --- /dev/null +++ b/.gitea/workflows/cd.yaml @@ -0,0 +1,48 @@ +# CD pipeline. Builds docker image and pushes it to the registry, when PR is merged with main + +name: CD + +on: + push: + branches: + - main + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Login to Registry + uses: docker/login-action@v2 + with: + registry: ${{ variables.DOCKER_REGISTRY }} + username: ${{ secrets.REGISTRY_USER }} + password: ${{ secrets.REGISTRY_PASSWORD }} + + - name: Get Metadata + id: meta + run: | + echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT + echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT + + - name: Build and push + uses: docker/build-push-action@v4 + with: + context: . + file: ./Dockerfile + platforms: | + linux/amd64 + linux/arm64 + push: false + tags: | + ${{ variables.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }} + ${{ variables.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:latest -- 2.49.1 From c0524b67e3fe62e227287a1d0baa8c86424ffd96 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Mon, 1 Apr 2024 18:49:11 +0200 Subject: [PATCH 02/11] fix: update runner --- .gitea/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 7693d87..3d19b52 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -10,7 +10,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: cth-ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 -- 2.49.1 From e5da4014b9f6327ee5fb99ff00b6949832d9312c Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Mon, 1 Apr 2024 19:44:19 +0200 Subject: [PATCH 03/11] Revert "fix: update runner" This reverts commit c0524b67e3fe62e227287a1d0baa8c86424ffd96. --- .gitea/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 3d19b52..7693d87 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -10,7 +10,7 @@ on: jobs: build: - runs-on: cth-ubuntu-latest + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 -- 2.49.1 From c0e6eb1a094c60d6e4f6383b082a9182535803d9 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Mon, 1 Apr 2024 19:55:43 +0200 Subject: [PATCH 04/11] fix: hard-code registry --- .gitea/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 7693d87..93fcdb3 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -24,7 +24,7 @@ jobs: - name: Login to Registry uses: docker/login-action@v2 with: - registry: ${{ variables.DOCKER_REGISTRY }} + registry: gitea.t000-n.de username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_PASSWORD }} -- 2.49.1 From c842f08df62370470839bd852fee79c6901aeabd Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Mon, 1 Apr 2024 20:02:29 +0200 Subject: [PATCH 05/11] fix: move DOCKER_REGISTRY to screts --- .gitea/workflows/cd.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 93fcdb3..1d65fab 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -24,7 +24,7 @@ jobs: - name: Login to Registry uses: docker/login-action@v2 with: - registry: gitea.t000-n.de + registry: ${{ secrets.DOCKER_REGISTRY }} username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_PASSWORD }} @@ -44,5 +44,5 @@ jobs: linux/arm64 push: false tags: | - ${{ variables.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }} - ${{ variables.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:latest + ${{ secrets.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }} + ${{ secrets.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:latest -- 2.49.1 From e2b3d9e946cdacf9e7e733716a8f3de089036254 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Mon, 1 Apr 2024 20:02:37 +0200 Subject: [PATCH 06/11] chore: remove comment --- .gitea/workflows/cd.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 1d65fab..cf62252 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -1,5 +1,3 @@ -# CD pipeline. Builds docker image and pushes it to the registry, when PR is merged with main - name: CD on: -- 2.49.1 From 7bcc603639c1dcdb91a4a410b3fc530004482f1b Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Mon, 1 Apr 2024 20:05:53 +0200 Subject: [PATCH 07/11] test: move DOCKER_REGISTRY to env --- .gitea/workflows/cd.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index cf62252..b559cec 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -22,7 +22,7 @@ jobs: - name: Login to Registry uses: docker/login-action@v2 with: - registry: ${{ secrets.DOCKER_REGISTRY }} + registry: ${{ env.DOCKER_REGISTRY }} username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_PASSWORD }} @@ -42,5 +42,5 @@ jobs: linux/arm64 push: false tags: | - ${{ secrets.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }} - ${{ secrets.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:latest + ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }} + ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:latest -- 2.49.1 From c02ad51923e55156da5060e49cc62fd84cd57272 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Mon, 1 Apr 2024 20:17:35 +0200 Subject: [PATCH 08/11] fix: add DOCKER_REGISTRY env --- .gitea/workflows/cd.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index b559cec..a7135c4 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -6,6 +6,9 @@ on: - main pull_request: +env: + DOCKER_REGISTRY: gitea.t000-n.de + jobs: build: runs-on: ubuntu-latest -- 2.49.1 From 77024afa3f60281b4f587e3d99a7a6f00be9c82e Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Mon, 1 Apr 2024 20:21:00 +0200 Subject: [PATCH 09/11] fix: force repo name to lower case --- .gitea/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index a7135c4..4ac520e 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -32,7 +32,7 @@ jobs: - name: Get Metadata id: meta run: | - echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT + echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | tr '[:upper:]' '[:lower:]') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT - name: Build and push -- 2.49.1 From 3392034a100178798db8fcb92a17d42e19a5644f Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Mon, 1 Apr 2024 20:33:14 +0200 Subject: [PATCH 10/11] chore: remove run on PR and enable pushing --- .gitea/workflows/cd.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 4ac520e..03b2e4c 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -4,7 +4,6 @@ on: push: branches: - main - pull_request: env: DOCKER_REGISTRY: gitea.t000-n.de @@ -43,7 +42,7 @@ jobs: platforms: | linux/amd64 linux/arm64 - push: false + push: true tags: | ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }} ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:latest -- 2.49.1 From c01e517d3aed078a7d21916c67a8812803bda433 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Mon, 1 Apr 2024 20:46:46 +0200 Subject: [PATCH 11/11] feat: only run after CI pipeline was successful --- .gitea/workflows/cd.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 03b2e4c..5407dda 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -1,9 +1,13 @@ name: CD on: - push: + workflow_run: + workflows: + - CI branches: - main + types: + - completed env: DOCKER_REGISTRY: gitea.t000-n.de -- 2.49.1