From 9b13797cc27bb9b47ecf5f966377078d764fd81e Mon Sep 17 00:00:00 2001 From: Ivan Cvitkovic Date: Tue, 6 Dec 2022 07:56:06 -0800 Subject: [PATCH 1/3] Update checkout action version; remove comment --- .github/workflows/build-deliver.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-deliver.yaml b/.github/workflows/build-deliver.yaml index 4bb630be..6e9f09e5 100644 --- a/.github/workflows/build-deliver.yaml +++ b/.github/workflows/build-deliver.yaml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout commit with full git history - uses: actions/checkout@v1 + uses: actions/checkout@v3 with: fetch-depth: 0 @@ -19,7 +19,6 @@ jobs: # TODO pin to hash uses: elgohr/Publish-Docker-Github-Action@master with: - # https://help.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions name: ${{ github.repository }} # configured at repo settings/secrets username: ${{ secrets.DOCKER_USERNAME }} From f2adaf7f4cfdc2caa744a073e74fc226c30430c9 Mon Sep 17 00:00:00 2001 From: Ivan Cvitkovic Date: Tue, 6 Dec 2022 07:56:41 -0800 Subject: [PATCH 2/3] Build and push docker images to GHCR --- .github/workflows/build-deliver.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/build-deliver.yaml b/.github/workflows/build-deliver.yaml index 6e9f09e5..cd636324 100644 --- a/.github/workflows/build-deliver.yaml +++ b/.github/workflows/build-deliver.yaml @@ -15,6 +15,24 @@ jobs: - name: Set environment variable for version from git output run: echo "VERSION_STRING=$(git describe --always --tags)" >> $GITHUB_ENV + - name: Publish to GitHub Container Registry + # TODO: pin to hash + uses: elgohr/Publish-Docker-Github-Action@master + with: + name: ${{ github.repository }} + registry: ghcr.io + + # GitHub actor + username: ${{ github.actor }} + + # GitHub access token + password: ${{ secrets.GITHUB_TOKEN }} + + # create docker image tags to match git tags + tag_names: true + buildargs: VERSION_STRING + + # TODO remove after every *-environments migrated to GHCR - name: Publish to Dockerhub registry # TODO pin to hash uses: elgohr/Publish-Docker-Github-Action@master From 675c91c3c0eb410b4532a6bc001252e7df15d814 Mon Sep 17 00:00:00 2001 From: Ivan Cvitkovic Date: Tue, 6 Dec 2022 07:58:42 -0800 Subject: [PATCH 3/3] Remove DockerHub as secondary image registry --- .github/workflows/build-deliver.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/build-deliver.yaml b/.github/workflows/build-deliver.yaml index cd636324..c6300db4 100644 --- a/.github/workflows/build-deliver.yaml +++ b/.github/workflows/build-deliver.yaml @@ -31,16 +31,3 @@ jobs: # create docker image tags to match git tags tag_names: true buildargs: VERSION_STRING - - # TODO remove after every *-environments migrated to GHCR - - name: Publish to Dockerhub registry - # TODO pin to hash - uses: elgohr/Publish-Docker-Github-Action@master - with: - name: ${{ github.repository }} - # configured at repo settings/secrets - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - # create docker image tags to match git tags - tag_names: true - buildargs: VERSION_STRING