From bc4a7e3856aadae0be71a6ae92ece3f3f0987e25 Mon Sep 17 00:00:00 2001 From: Jacobus Geluk Date: Tue, 27 Aug 2024 12:57:54 +0100 Subject: [PATCH] chore: moving from docker hub to ghcr.io --- .github/workflows/build.yml | 25 ++++++++++++++++--------- localbuild.sh | 4 ++-- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7b8c295..16d03db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,22 +3,29 @@ name: build-image on: push: branches: [ master ] - pull_request: - branches: [ master ] + +env: + VERSION: 0.0.7 + IMAGE_OWNER: ghcr.io/ekgf + IMAGE_NAME: ${{ github.repository_name }} jobs: build: runs-on: ubuntu-latest + permissions: + packages: write + env: + FQ_IMAGE_NAME: ${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }} + TAGS: ${{ env.IMAGE_NAME }}:latest, ${{ env.IMAGE_NAME }}:${{ env.VERSION }} steps: - - uses: actions/checkout@v2 + - name: Checkout ekgf/gloud-terraform + uses: actions/checkout@v4 + - name: Build and push Docker images - uses: docker/build-push-action@v1.1.0 + uses: docker/build-push-action@v3 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - repository: ekgf/gcloud-terraform # # TODO: Get the version number from a file (for instance localbuild.sh) or "/VERSION" # - tags: latest, 0.0.6 - always_pull: true + tags: ${{ env.TAGS }} + pull: true diff --git a/localbuild.sh b/localbuild.sh index d0f2574..4c3ecbc 100755 --- a/localbuild.sh +++ b/localbuild.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)" -_IMAGE_NAME="docker.io/ekgf/gcloud-terraform" +_IMAGE_NAME="ghcr.io/ekgf/gcloud-terraform" _IMAGE_VERSION="latest" -_MANUALLY_INCREMENTED_IMAGE_VERSION="0.0.6" +_MANUALLY_INCREMENTED_IMAGE_VERSION="0.0.7" cd "${SCRIPT_DIR}" || exit 1