From cc37256fb10775c65d87462aba9e577ca58af4c6 Mon Sep 17 00:00:00 2001 From: stephen schuresko Date: Sun, 16 Feb 2025 16:35:05 -0500 Subject: [PATCH 1/7] migrate build and push workflow to new location --- .gitea/{actions => workflows}/build-and-push.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .gitea/{actions => workflows}/build-and-push.yaml (100%) diff --git a/.gitea/actions/build-and-push.yaml b/.gitea/workflows/build-and-push.yaml similarity index 100% rename from .gitea/actions/build-and-push.yaml rename to .gitea/workflows/build-and-push.yaml -- 2.43.0 From 2d78bc1acc3bf59a581c2dc545f90f1d6c7e2573 Mon Sep 17 00:00:00 2001 From: stephen schuresko Date: Sun, 16 Feb 2025 16:48:10 -0500 Subject: [PATCH 2/7] update docker login command to use environment variables for credentials --- .gitea/workflows/build-and-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-push.yaml b/.gitea/workflows/build-and-push.yaml index e6361da..24f9955 100644 --- a/.gitea/workflows/build-and-push.yaml +++ b/.gitea/workflows/build-and-push.yaml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - run: docker login kube-reg.fairfaxmedia.net # Login to private registry + - run: docker login kube-reg.fairfaxmedia.net -u $DOCK_REG_USER -p $DOCK_REG_AUTH # Login to private registry - run: docker build -t kube-reg.fairfaxmedia.net/papi/svc1:${CI_BRANCH} . # Build the Docker image - run: docker push kube-reg.fairfaxmedia.net/papi/svc1:${CI_BRANCH} # Push the Docker image -- 2.43.0 From 0efdade499c086987fde92a905b6d2b23564e001 Mon Sep 17 00:00:00 2001 From: stephen schuresko Date: Sun, 16 Feb 2025 16:56:05 -0500 Subject: [PATCH 3/7] fix: update docker login command to use curly braces for environment variables --- .gitea/workflows/build-and-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-push.yaml b/.gitea/workflows/build-and-push.yaml index 24f9955..c3ef7df 100644 --- a/.gitea/workflows/build-and-push.yaml +++ b/.gitea/workflows/build-and-push.yaml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - run: docker login kube-reg.fairfaxmedia.net -u $DOCK_REG_USER -p $DOCK_REG_AUTH # Login to private registry + - run: docker login kube-reg.fairfaxmedia.net -u ${DOCK_REG_USER} -p ${DOCK_REG_AUTH} # Login to private registry - run: docker build -t kube-reg.fairfaxmedia.net/papi/svc1:${CI_BRANCH} . # Build the Docker image - run: docker push kube-reg.fairfaxmedia.net/papi/svc1:${CI_BRANCH} # Push the Docker image -- 2.43.0 From 4b2aaeb3619943bef418998f8efa27aeee6f4a0f Mon Sep 17 00:00:00 2001 From: stephen schuresko Date: Sun, 16 Feb 2025 16:58:58 -0500 Subject: [PATCH 4/7] fix: update docker commands to use GitHub Actions syntax for variables --- .gitea/workflows/build-and-push.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build-and-push.yaml b/.gitea/workflows/build-and-push.yaml index c3ef7df..91e8855 100644 --- a/.gitea/workflows/build-and-push.yaml +++ b/.gitea/workflows/build-and-push.yaml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - run: docker login kube-reg.fairfaxmedia.net -u ${DOCK_REG_USER} -p ${DOCK_REG_AUTH} # Login to private registry - - run: docker build -t kube-reg.fairfaxmedia.net/papi/svc1:${CI_BRANCH} . # Build the Docker image - - run: docker push kube-reg.fairfaxmedia.net/papi/svc1:${CI_BRANCH} # Push the Docker image + - run: docker login kube-reg.fairfaxmedia.net -u ${{ vars.DOCK_REG_USER }} -p ${{ vars.DOCK_REG_AUTH }} # Login to private registry + - run: docker build -t kube-reg.fairfaxmedia.net/papi/svc1:${{ gitea.ref }} . # Build the Docker image + - run: docker push kube-reg.fairfaxmedia.net/papi/svc1:${{ gitea.ref }} # Push the Docker image -- 2.43.0 From 56587925db389a77a23d5fed7d4bb026908c7296 Mon Sep 17 00:00:00 2001 From: stephen schuresko Date: Sun, 16 Feb 2025 17:06:58 -0500 Subject: [PATCH 5/7] fix: remove unnecessary blank line in build and push workflow --- .gitea/workflows/build-and-push.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/build-and-push.yaml b/.gitea/workflows/build-and-push.yaml index 91e8855..33fd4da 100644 --- a/.gitea/workflows/build-and-push.yaml +++ b/.gitea/workflows/build-and-push.yaml @@ -5,7 +5,6 @@ name: Build and Push to Private Registry - on: push: branches: -- 2.43.0 From 253274363dc59ba86c3ddea1eb0553d7423d849f Mon Sep 17 00:00:00 2001 From: stephen schuresko Date: Sun, 16 Feb 2025 17:09:07 -0500 Subject: [PATCH 6/7] fix: update docker login command to use secrets for authentication --- .gitea/workflows/build-and-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-push.yaml b/.gitea/workflows/build-and-push.yaml index 33fd4da..048d69a 100644 --- a/.gitea/workflows/build-and-push.yaml +++ b/.gitea/workflows/build-and-push.yaml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - run: docker login kube-reg.fairfaxmedia.net -u ${{ vars.DOCK_REG_USER }} -p ${{ vars.DOCK_REG_AUTH }} # Login to private registry + - run: docker login kube-reg.fairfaxmedia.net -u docker -p ${{ secrets.DOCK_REG_AUTH }} # Login to private registry - run: docker build -t kube-reg.fairfaxmedia.net/papi/svc1:${{ gitea.ref }} . # Build the Docker image - run: docker push kube-reg.fairfaxmedia.net/papi/svc1:${{ gitea.ref }} # Push the Docker image -- 2.43.0 From 4d06b721328b3c912a4d153355e7b63d341b5a50 Mon Sep 17 00:00:00 2001 From: stephen schuresko Date: Sun, 16 Feb 2025 17:12:43 -0500 Subject: [PATCH 7/7] fix: extract branch name for Docker image tagging in build and push workflow --- .gitea/workflows/build-and-push.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-and-push.yaml b/.gitea/workflows/build-and-push.yaml index 048d69a..3db58d9 100644 --- a/.gitea/workflows/build-and-push.yaml +++ b/.gitea/workflows/build-and-push.yaml @@ -18,8 +18,12 @@ jobs: build: runs-on: ubuntu-latest steps: + - name: Extract branch name + shell: bash + run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT + id: extract_branch - uses: actions/checkout@v3 - run: docker login kube-reg.fairfaxmedia.net -u docker -p ${{ secrets.DOCK_REG_AUTH }} # Login to private registry - - run: docker build -t kube-reg.fairfaxmedia.net/papi/svc1:${{ gitea.ref }} . # Build the Docker image - - run: docker push kube-reg.fairfaxmedia.net/papi/svc1:${{ gitea.ref }} # Push the Docker image + - run: docker build -t kube-reg.fairfaxmedia.net/papi/svc1:${{ steps.extract_branch.outputs.branch }} . # Build the Docker image + - run: docker push kube-reg.fairfaxmedia.net/papi/svc1:${{ steps.extract_branch.outputs.branch }} # Push the Docker image -- 2.43.0