From d023c5f0236d35f567218ffe2dbc3688a6f63c58 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sat, 2 Oct 2021 15:46:09 +0100 Subject: [PATCH 1/4] Tweaks to docker build action: - Update to reflect master branch name change to main - GITHUB_TOKEN is now valid for pushing to ghcr.io - Allow forked repos to utilise action script and push to their own package repository - requires lowercaseing the github.repository context Signed-off-by: Adam Warner --- .github/workflows/docker.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index dd47b908..2ab80393 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,7 +2,7 @@ name: Docker on: push: - branches: master + branches: main jobs: docker: @@ -26,22 +26,24 @@ jobs: - name: Login to Github Packages uses: docker/login-action@v1 - env: - GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }} with: registry: ghcr.io username: ${{ github.repository_owner }} - password: ${{ secrets.GHCR_TOKEN }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: lowercase repo name for tag + uses: ASzc/change-string-case-action@v1 + id: reponame + with: + string: ghcr.io/${{ github.repository }} - name: Build id: docker_build uses: docker/build-push-action@v2 - env: - GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }} with: push: true tags: | - ghcr.io/syncforynab/fintech-to-ynab:sha_${{ github.sha }} - ghcr.io/syncforynab/fintech-to-ynab:latest + ${{ steps.reponame.outputs.lowercase }}:sha_${{ github.sha }} + ${{ steps.reponame.outputs.lowercase }}:latest cache-from: type=local,src=/tmp/.docker-buildx-cache cache-to: type=local,dest=/tmp/.docker-buildx-cache From fb4fac673e55fb82a886842169304668ddf30614 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sat, 2 Oct 2021 15:48:02 +0100 Subject: [PATCH 2/4] Allow adding a custom hostname to config.hosts to prevent "Blocked host:" message when attempting to connect from something other than localhost / 0.0.0.0 Signed-off-by: Adam Warner --- config/environments/development.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/environments/development.rb b/config/environments/development.rb index 6a21e9aa..cbcbab02 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -38,4 +38,10 @@ # Use an evented file watcher to asynchronously detect changes in source code, # routes, locales, etc. This feature depends on the listen gem. config.file_watcher = ActiveSupport::EventedFileUpdateChecker + + # Prevent "Blocked host: hostname" + if !ENV["APP_HOSTNAME"].nil? + config.hosts << ENV["APP_HOSTNAME"] + end + end From 6f047eac96d168222157bda572c2c856ce21f49d Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sat, 2 Oct 2021 17:12:15 +0100 Subject: [PATCH 3/4] tweaks to GHA to use metadata-action Signed-off-by: Adam Warner --- .github/workflows/docker.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2ab80393..55d9ef7b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -31,19 +31,22 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - name: lowercase repo name for tag - uses: ASzc/change-string-case-action@v1 - id: reponame + - name: Docker meta + id: meta + uses: docker/metadata-action@v3 with: - string: ghcr.io/${{ github.repository }} + images: ghcr.io/${{ github.repository }} + tags: | + sha_${{ github.sha }} + latest + github-token: ${{ secrets.GITHUB_TOKEN }} - name: Build id: docker_build uses: docker/build-push-action@v2 with: push: true - tags: | - ${{ steps.reponame.outputs.lowercase }}:sha_${{ github.sha }} - ${{ steps.reponame.outputs.lowercase }}:latest + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} cache-from: type=local,src=/tmp/.docker-buildx-cache cache-to: type=local,dest=/tmp/.docker-buildx-cache From 777ef2505cf27f0acef0a057aee7bff8e6a48a81 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sat, 2 Oct 2021 17:23:10 +0100 Subject: [PATCH 4/4] nil? -> present? Signed-off-by: Adam Warner --- config/environments/development.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index cbcbab02..cb5bdf64 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -40,7 +40,7 @@ config.file_watcher = ActiveSupport::EventedFileUpdateChecker # Prevent "Blocked host: hostname" - if !ENV["APP_HOSTNAME"].nil? + if ENV["APP_HOSTNAME"].present? config.hosts << ENV["APP_HOSTNAME"] end