From 828260b2949d04783bc005b89c93c60105f211a0 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 15:14:14 -0500 Subject: [PATCH 01/37] Add first cut of Docker action --- .github/workflows/build.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..6bf666a1 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,27 @@ +--- +name: Build + +on: [push, pull_request] + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - + name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v6 + with: + push: true + tags: freezingsaddles/freezing-web:latest-actions-build From ec47631d543b0b75e7c4ad8bf6fce79aef5ff2d2 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 15:18:04 -0500 Subject: [PATCH 02/37] Bump versions to avoid node deprecation warnings --- .github/workflows/lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 000d56ba..76bef796 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out source repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python environment - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: black Lint From a1c5afbcaaa2d1c10be36a462d0cc4fac0889973 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 15:47:30 -0500 Subject: [PATCH 03/37] Try to split action, prep for reusable parts --- .github/workflows/build-docker.yml | 41 ++++++++++++++++++++++++++++++ .github/workflows/build.yml | 20 +++------------ 2 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 .github/workflows/build-docker.yml diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml new file mode 100644 index 00000000..82964407 --- /dev/null +++ b/.github/workflows/build-docker.yml @@ -0,0 +1,41 @@ +--- +name: Docker Build and Push + +on: workflow_dispatch + +inputs: + + org: + description: 'Docker Hub organization' + default: ${{ github.event.org.login }} + + repo: + description: 'Docker Hub repository name' + default: ${{ github.event.repository.name }} + + tag: + description: 'tag for Docker container' + default: ${{ GITHUB_SHA }} + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - + name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v6 + with: + push: true + tags: ${{ org }}/${{ repo }}:${{ tag }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6bf666a1..a40e6ede 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,23 +5,11 @@ on: [push, pull_request] jobs: docker: + runs-on: ubuntu-latest steps: - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v6 + name: Build + uses: freezingsaddles/freezing-web/.github/workflows/docker-build.yml@github-actions-docker-build with: - push: true - tags: freezingsaddles/freezing-web:latest-actions-build + tag: latest-actions-build From d3f5f0188021e55da694f1e6c0a96a01f89f1ab5 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 15:51:56 -0500 Subject: [PATCH 04/37] Tweak workflow call --- .github/workflows/build.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a40e6ede..546bd37c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,11 +5,7 @@ on: [push, pull_request] jobs: docker: - - runs-on: ubuntu-latest - steps: - - - name: Build - uses: freezingsaddles/freezing-web/.github/workflows/docker-build.yml@github-actions-docker-build - with: - tag: latest-actions-build + uses: freezingsaddles/freezing-web/.github/workflows/docker-build.yml@github-actions-docker-build + with: + tag: latest-actions-build + secrets: inherit From afc68ac78eb42a7fc9e9e59030596fb97a05e3b5 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 15:53:07 -0500 Subject: [PATCH 05/37] Fix indent level --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 546bd37c..d3a83e0f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,6 +6,6 @@ on: [push, pull_request] jobs: docker: uses: freezingsaddles/freezing-web/.github/workflows/docker-build.yml@github-actions-docker-build - with: - tag: latest-actions-build - secrets: inherit + with: + tag: latest-actions-build + secrets: inherit From 05129196316029cd480e704ba60d141e43a534d0 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 15:55:58 -0500 Subject: [PATCH 06/37] Bump version, fix path --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3a83e0f..2e53160a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/docker-build.yml@github-actions-docker-build + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.0 with: tag: latest-actions-build secrets: inherit From d98581910e32f6fbe10fc170d830cfffeb339936 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 15:57:12 -0500 Subject: [PATCH 07/37] Tweak workflow call --- .github/workflows/build-docker.yml | 2 +- .github/workflows/build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 82964407..a6cabf7b 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -1,7 +1,7 @@ --- name: Docker Build and Push -on: workflow_dispatch +on: workflow_call inputs: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e53160a..8350744b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.0 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.1 with: tag: latest-actions-build secrets: inherit From 6032ad68bd50e6beb274fdc0ca9cc9520fb7b205 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 16:01:11 -0500 Subject: [PATCH 08/37] Tweak inputs and secrets --- .github/workflows/build-docker.yml | 32 +++++++++++++++++------------- .github/workflows/build.yml | 2 +- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index a6cabf7b..27b030c3 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -2,20 +2,24 @@ name: Docker Build and Push on: workflow_call - -inputs: - - org: - description: 'Docker Hub organization' - default: ${{ github.event.org.login }} - - repo: - description: 'Docker Hub repository name' - default: ${{ github.event.repository.name }} - - tag: - description: 'tag for Docker container' - default: ${{ GITHUB_SHA }} + inputs: + org: + required: false + description: 'Docker Hub organization' + default: ${{ github.event.org.login }} + repo: + required: false + description: 'Docker Hub repository name' + default: ${{ github.event.repository.name }} + tag: + required: false + description: 'tag for Docker container' + default: ${{ GITHUB_SHA }} + secrets: + DOCKERHUB_USERNAME: + required: true + DOCKERHUB_TOKEN: + required: true jobs: docker: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8350744b..9a657d2b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.1 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.2 with: tag: latest-actions-build secrets: inherit From 57f5387bda49137bccc217ef5b989b218cedcc33 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 16:02:46 -0500 Subject: [PATCH 09/37] Pare back to pull request --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a657d2b..de013607 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ --- name: Build -on: [push, pull_request] +on: pull_request jobs: docker: From 836d6e3b47bb0ee26b2460b880078f427510f7bf Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 16:04:00 -0500 Subject: [PATCH 10/37] Tweak indents and version --- .github/workflows/build-docker.yml | 39 +++++++++++++++--------------- .github/workflows/build.yml | 2 +- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 27b030c3..cd52ef3d 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -1,25 +1,26 @@ --- name: Docker Build and Push -on: workflow_call - inputs: - org: - required: false - description: 'Docker Hub organization' - default: ${{ github.event.org.login }} - repo: - required: false - description: 'Docker Hub repository name' - default: ${{ github.event.repository.name }} - tag: - required: false - description: 'tag for Docker container' - default: ${{ GITHUB_SHA }} - secrets: - DOCKERHUB_USERNAME: - required: true - DOCKERHUB_TOKEN: - required: true +on: + workflow_call: + inputs: + org: + required: false + description: 'Docker Hub organization' + default: ${{ github.event.org.login }} + repo: + required: false + description: 'Docker Hub repository name' + default: ${{ github.event.repository.name }} + tag: + required: false + description: 'tag for Docker container' + default: ${{ GITHUB_SHA }} + secrets: + DOCKERHUB_USERNAME: + required: true + DOCKERHUB_TOKEN: + required: true jobs: docker: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index de013607..f9f72ebc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: pull_request jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.2 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.3 with: tag: latest-actions-build secrets: inherit From d5d231a629f5e5bce92c4e2ca9d7e0f5df211f68 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 16:05:54 -0500 Subject: [PATCH 11/37] Add required type --- .github/workflows/build-docker.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index cd52ef3d..542c6b30 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -5,17 +5,20 @@ on: workflow_call: inputs: org: - required: false - description: 'Docker Hub organization' default: ${{ github.event.org.login }} - repo: + description: 'Docker Hub organization' required: false - description: 'Docker Hub repository name' + type: string + repo: default: ${{ github.event.repository.name }} - tag: + description: 'Docker Hub repository name' required: false - description: 'tag for Docker container' + type: string + tag: default: ${{ GITHUB_SHA }} + description: 'tag for Docker container' + required: false + type: string secrets: DOCKERHUB_USERNAME: required: true From c4377d5f4790420a4e702910215eba7ef83765b0 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 16:06:12 -0500 Subject: [PATCH 12/37] Tweak version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9f72ebc..6ec45713 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: pull_request jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.3 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.4 with: tag: latest-actions-build secrets: inherit From e2ffd417135e0eb6f094d42e5c1f0ef8d11c8efd Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 16:09:54 -0500 Subject: [PATCH 13/37] Tweak default tag to latest - ugh --- .github/workflows/build-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 542c6b30..8058b153 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -15,7 +15,7 @@ on: required: false type: string tag: - default: ${{ GITHUB_SHA }} + default: latest description: 'tag for Docker container' required: false type: string From fc363300a4303d17b2673c28f5f7a6b83ed7d53a Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 16:10:15 -0500 Subject: [PATCH 14/37] Tweak version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ec45713..f1303893 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: pull_request jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.4 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.5 with: tag: latest-actions-build secrets: inherit From 25b29b2e50933c814fb62db4254c8835d8db7cb2 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 16:12:11 -0500 Subject: [PATCH 15/37] dumb down --- .github/workflows/build-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 8058b153..c7df4ece 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -5,12 +5,12 @@ on: workflow_call: inputs: org: - default: ${{ github.event.org.login }} + default: freezingsaddles description: 'Docker Hub organization' required: false type: string repo: - default: ${{ github.event.repository.name }} + default: freezing-web description: 'Docker Hub repository name' required: false type: string From 6402d7c86fc9eaa944288dc90de816557b7dfc2e Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 16:12:31 -0500 Subject: [PATCH 16/37] Tweak version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f1303893..c6ca8a5c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: pull_request jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.5 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.6 with: tag: latest-actions-build secrets: inherit From 496cb6a3307061f7b19fcb5fdeae19703876f2ef Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 16:13:58 -0500 Subject: [PATCH 17/37] Tweak syntax and version --- .github/workflows/build-docker.yml | 2 +- .github/workflows/build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index c7df4ece..a89bd0f6 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -46,4 +46,4 @@ jobs: uses: docker/build-push-action@v6 with: push: true - tags: ${{ org }}/${{ repo }}:${{ tag }} + tags: ${{ inputs.org }}/${{ inputs.repo }}:${{ inputs.tag }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c6ca8a5c..ba0762ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: pull_request jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.6 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.7 with: tag: latest-actions-build secrets: inherit From 6f56dcb3be3c9fcb15dc455f7bad9b887f9a7ff9 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 16:28:24 -0500 Subject: [PATCH 18/37] Tweak ENTRYPOINT per Docker action advice JSON arguments recommended for ENTRYPOINT/CMD to prevent unintended behavior related to OS signals: Dockerfile#L15 JSONArgsRecommended: JSON arguments recommended for ENTRYPOINT to prevent unintended behavior related to OS signals More info: https://docs.docker.com/go/dockerfile/rule/json-args-recommended/ --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 12795220..8aca33a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,4 +12,4 @@ WORKDIR /app ENV LEADERBOARDS_DIR=/data/leaderboards USER freezing EXPOSE 8000 -ENTRYPOINT gunicorn --bind 0.0.0.0:8000 'freezing.web:app' +ENTRYPOINT ["gunicorn", "--bind", "0.0.0.0:8000", "freezing.web:app"] From 85529c85707f6c55badb27262e641a9799772e93 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 16:39:37 -0500 Subject: [PATCH 19/37] Build more variants --- .github/workflows/build-latest.yml | 11 +++++++++++ .github/workflows/build-tag.yml | 17 +++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 .github/workflows/build-latest.yml create mode 100644 .github/workflows/build-tag.yml diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml new file mode 100644 index 00000000..fe931cdb --- /dev/null +++ b/.github/workflows/build-latest.yml @@ -0,0 +1,11 @@ +--- +name: Build + +on: pull_request + +jobs: + docker: + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.7 + with: + tag: latest + secrets: inherit diff --git a/.github/workflows/build-tag.yml b/.github/workflows/build-tag.yml new file mode 100644 index 00000000..8eeb6bc7 --- /dev/null +++ b/.github/workflows/build-tag.yml @@ -0,0 +1,17 @@ +--- +name: Build Tag + +on: + push: + tags: + - '*' + +jobs: + docker: + steps: + - uses: olegtarasov/get-tag@v2.1.3 + id: tagName + - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.7 + with: + tag: ${{ steps.tagName.outputs.tag }} + secrets: inherit From 8775e83510a6131d638de3665924a5d3671b878c Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 16:43:02 -0500 Subject: [PATCH 20/37] Simplify --- .github/workflows/build-tag.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-tag.yml b/.github/workflows/build-tag.yml index 8eeb6bc7..0bdf64bf 100644 --- a/.github/workflows/build-tag.yml +++ b/.github/workflows/build-tag.yml @@ -8,10 +8,7 @@ on: jobs: docker: - steps: - - uses: olegtarasov/get-tag@v2.1.3 - id: tagName - - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.7 - with: - tag: ${{ steps.tagName.outputs.tag }} - secrets: inherit + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.7 + with: + tag: ${{ github.ref_name }} + secrets: inherit From 6a2a8fb5f6291428bfa71a40b62f536b87d6cd5c Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 17:23:59 -0500 Subject: [PATCH 21/37] Add SSH action --- .github/workflows/build-latest.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index fe931cdb..aa47ca38 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -1,11 +1,28 @@ --- -name: Build +name: Build and Deploy on: pull_request +on: + push: + branches: + - 'master' + - 'github-actions-docker-build' # until this is debugged, remove before merging + jobs: docker: uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.7 with: tag: latest secrets: inherit + + deploy: + uses: appleboy/ssh-action@v1.1.0 + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.KEY }} + port: ${{ secrets.PORT }} + passphrase: ${{ secrets.PASSPHRASE }} + script: | + ls .ssh/authorized_keys From 0e8517ef2576c3a12494ddcb0189e8adf95fbedd Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 17:30:01 -0500 Subject: [PATCH 22/37] Fix syntax --- .github/workflows/build-latest.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index aa47ca38..bf239863 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -1,8 +1,6 @@ --- name: Build and Deploy -on: pull_request - on: push: branches: From eebd365149000e8cab00d3c3b14bc0175e79570e Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 17:34:08 -0500 Subject: [PATCH 23/37] Just debug ssh --- .github/workflows/build-latest.yml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index bf239863..42723f64 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -8,19 +8,21 @@ on: - 'github-actions-docker-build' # until this is debugged, remove before merging jobs: - docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.7 - with: - tag: latest - secrets: inherit + #docker: + # uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.7 + # with: + # tag: latest + # secrets: inherit deploy: - uses: appleboy/ssh-action@v1.1.0 - with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.KEY }} - port: ${{ secrets.PORT }} - passphrase: ${{ secrets.PASSPHRASE }} - script: | - ls .ssh/authorized_keys + steps: + - name: install + uses: appleboy/ssh-action@v1.1.0 + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.KEY }} + port: ${{ secrets.PORT }} + passphrase: ${{ secrets.PASSPHRASE }} + script: | + ls .ssh/authorized_keys From 66b92d9b7f3ebacc895f76b826e5c2b757468ea4 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 17:35:31 -0500 Subject: [PATCH 24/37] Add runner --- .github/workflows/build-latest.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 42723f64..aabe2b1e 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -15,6 +15,8 @@ jobs: # secrets: inherit deploy: + runs-on: ubuntu-latest + timeout-minutes: 5 steps: - name: install uses: appleboy/ssh-action@v1.1.0 From a2a96db674adbb185eb21303677c2f37a158aaa7 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 17:36:53 -0500 Subject: [PATCH 25/37] Switch to restart --- .github/workflows/build-latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index aabe2b1e..d8e41d82 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -27,4 +27,4 @@ jobs: port: ${{ secrets.PORT }} passphrase: ${{ secrets.PASSPHRASE }} script: | - ls .ssh/authorized_keys + restart From 21a7e1f96577ca61afc4fb2880a29954e3bdc9b8 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 17:40:31 -0500 Subject: [PATCH 26/37] deploy explicitly --- .github/workflows/build-latest.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index d8e41d82..b131ad48 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -27,4 +27,7 @@ jobs: port: ${{ secrets.PORT }} passphrase: ${{ secrets.PASSPHRASE }} script: | - restart + set -euo pipefail + cd /opt/compose + docker-compose pull freezing-web + docker-compose up freezing-web -d From 2be86a087bacd7357cf0d6ceb11c5cd60a1c761b Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 17:41:36 -0500 Subject: [PATCH 27/37] Tweak cli order --- .github/workflows/build-latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index b131ad48..86f6800c 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -30,4 +30,4 @@ jobs: set -euo pipefail cd /opt/compose docker-compose pull freezing-web - docker-compose up freezing-web -d + docker-compose up -d freezing-web From a67f644cd3dd025c4ddbae05794661f889dfbd1b Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 17:56:58 -0500 Subject: [PATCH 28/37] Go all the way to testing --- .github/workflows/build-latest.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 86f6800c..1f3da398 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -1,14 +1,13 @@ --- -name: Build and Deploy +name: Build, Deploy and Test Latest on: push: branches: - 'master' - - 'github-actions-docker-build' # until this is debugged, remove before merging jobs: - #docker: + # docker: # uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.7 # with: # tag: latest @@ -18,6 +17,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 5 steps: + - name: install uses: appleboy/ssh-action@v1.1.0 with: @@ -31,3 +31,17 @@ jobs: cd /opt/compose docker-compose pull freezing-web docker-compose up -d freezing-web + + - name: wait + uses: iFaxity/wait-on-action + with: + resource: https-get://freezingsaddles.org + timeout: 5000 + + - name: checkout + uses: actions/checkout@v4 + + - name: test + steps: + run: "URL=https://freezingsaddles.org test/wget-spider.sh" + From cd379c137ee5ee69d2c2c7d2b1ef9e895b63f1fd Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 17:59:19 -0500 Subject: [PATCH 29/37] Fix syntax --- .github/workflows/build-latest.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 1f3da398..22c56678 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -42,6 +42,5 @@ jobs: uses: actions/checkout@v4 - name: test - steps: - run: "URL=https://freezingsaddles.org test/wget-spider.sh" + run: "URL=https://freezingsaddles.org test/wget-spider.sh" From 07a0deab76e236e81674cd8d394de90dbef0b666 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 18:00:12 -0500 Subject: [PATCH 30/37] Fix action version --- .github/workflows/build-latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 22c56678..21edaf8b 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -33,7 +33,7 @@ jobs: docker-compose up -d freezing-web - name: wait - uses: iFaxity/wait-on-action + uses: iFaxity/wait-on-action@v1.2.1 with: resource: https-get://freezingsaddles.org timeout: 5000 From c903f32c3df3391b0bacebb04bf2b241dbf8f13e Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 18:03:31 -0500 Subject: [PATCH 31/37] re-arm pr branch --- .github/workflows/build-latest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 21edaf8b..94f1894a 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -5,6 +5,7 @@ on: push: branches: - 'master' + - 'github-actions-docker-build' jobs: # docker: From 64d047d5ba403acaeadeb54330eab5cb2c777132 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 18:08:51 -0500 Subject: [PATCH 32/37] Bump version for release --- .github/workflows/build-latest.yml | 16 ++++++++-------- .github/workflows/build-tag.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/lint.yml | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 94f1894a..beea7b4c 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -5,16 +5,16 @@ on: push: branches: - 'master' - - 'github-actions-docker-build' jobs: - # docker: - # uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.7 - # with: - # tag: latest - # secrets: inherit - deploy: + docker: + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.8 + with: + tag: latest + secrets: inherit + + deploy-and-test: runs-on: ubuntu-latest timeout-minutes: 5 steps: @@ -42,6 +42,6 @@ jobs: - name: checkout uses: actions/checkout@v4 - - name: test + - name: test-wget-spider run: "URL=https://freezingsaddles.org test/wget-spider.sh" diff --git a/.github/workflows/build-tag.yml b/.github/workflows/build-tag.yml index 0bdf64bf..8ea6e044 100644 --- a/.github/workflows/build-tag.yml +++ b/.github/workflows/build-tag.yml @@ -8,7 +8,7 @@ on: jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.7 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.8 with: tag: ${{ github.ref_name }} secrets: inherit diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ba0762ab..4a00160f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: pull_request jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.7 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.8 with: tag: latest-actions-build secrets: inherit diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 76bef796..51398ac8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,7 +1,7 @@ --- name: Lint -on: [push, pull_request] +on: pull_request jobs: From 816efcaa054d73c7a35ff71e4a4727e390ebe909 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 18:10:52 -0500 Subject: [PATCH 33/37] Fix name, Bump version for release --- .github/workflows/build-latest.yml | 6 +++--- .github/workflows/build-tag.yml | 2 +- .github/workflows/build.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index beea7b4c..c4a23a68 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -1,5 +1,5 @@ --- -name: Build, Deploy and Test Latest +name: "Build, Deploy and Test Latest" on: push: @@ -9,8 +9,8 @@ on: jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.8 - with: + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.11 + with: tag: latest secrets: inherit diff --git a/.github/workflows/build-tag.yml b/.github/workflows/build-tag.yml index 8ea6e044..a6cece9e 100644 --- a/.github/workflows/build-tag.yml +++ b/.github/workflows/build-tag.yml @@ -8,7 +8,7 @@ on: jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.8 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.11 with: tag: ${{ github.ref_name }} secrets: inherit diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a00160f..614ef0fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: pull_request jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.8 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.11 with: tag: latest-actions-build secrets: inherit From 9ad5a46a0a2c93de166d2574fb76c5dba7168ebd Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 18:12:40 -0500 Subject: [PATCH 34/37] Fix indent, bump version for release --- .github/workflows/build-latest.yml | 2 +- .github/workflows/build-tag.yml | 2 +- .github/workflows/build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index c4a23a68..55860b92 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -9,7 +9,7 @@ on: jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.11 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.12 with: tag: latest secrets: inherit diff --git a/.github/workflows/build-tag.yml b/.github/workflows/build-tag.yml index a6cece9e..35a7145e 100644 --- a/.github/workflows/build-tag.yml +++ b/.github/workflows/build-tag.yml @@ -8,7 +8,7 @@ on: jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.11 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.12 with: tag: ${{ github.ref_name }} secrets: inherit diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 614ef0fe..bdb26c87 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: pull_request jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.11 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.12 with: tag: latest-actions-build secrets: inherit From 70887f84696be576cf471af26dfbde19b59eecff Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 18:14:35 -0500 Subject: [PATCH 35/37] Fix indents and versions again --- .github/workflows/build-latest.yml | 4 ++-- .github/workflows/build-tag.yml | 2 +- .github/workflows/build.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 55860b92..53d7a14e 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -9,8 +9,8 @@ on: jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.12 - with: + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.13 + with: tag: latest secrets: inherit diff --git a/.github/workflows/build-tag.yml b/.github/workflows/build-tag.yml index 35a7145e..416cdd4c 100644 --- a/.github/workflows/build-tag.yml +++ b/.github/workflows/build-tag.yml @@ -8,7 +8,7 @@ on: jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.12 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.13 with: tag: ${{ github.ref_name }} secrets: inherit diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bdb26c87..1838a39e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: pull_request jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.12 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.13 with: tag: latest-actions-build secrets: inherit From 58e02224cf629dc6e96b1f527360f2b749bb3714 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 18:19:15 -0500 Subject: [PATCH 36/37] Yet more bumps and indent tweaks --- .github/workflows/build-latest.yml | 12 ++++++------ .github/workflows/build-tag.yml | 2 +- .github/workflows/build.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 53d7a14e..f149290a 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -1,5 +1,5 @@ --- -name: "Build, Deploy and Test Latest" +name: Build Deploy and Test Latest on: push: @@ -8,11 +8,11 @@ on: jobs: - docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.13 - with: - tag: latest - secrets: inherit + docker: + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.15 + with: + tag: latest + secrets: inherit deploy-and-test: runs-on: ubuntu-latest diff --git a/.github/workflows/build-tag.yml b/.github/workflows/build-tag.yml index 416cdd4c..662c5d6b 100644 --- a/.github/workflows/build-tag.yml +++ b/.github/workflows/build-tag.yml @@ -8,7 +8,7 @@ on: jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.13 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.15 with: tag: ${{ github.ref_name }} secrets: inherit diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1838a39e..b2fbc462 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: pull_request jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.13 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.15 with: tag: latest-actions-build secrets: inherit From 4e4a9d461042ef9681679231aaa27af2480ee5dd Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Sun, 10 Nov 2024 18:20:16 -0500 Subject: [PATCH 37/37] Bump version for release --- .github/workflows/build-latest.yml | 2 +- .github/workflows/build-tag.yml | 2 +- .github/workflows/build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index f149290a..c1077d15 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -9,7 +9,7 @@ on: jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.15 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.16 with: tag: latest secrets: inherit diff --git a/.github/workflows/build-tag.yml b/.github/workflows/build-tag.yml index 662c5d6b..d7ab1f8b 100644 --- a/.github/workflows/build-tag.yml +++ b/.github/workflows/build-tag.yml @@ -8,7 +8,7 @@ on: jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.15 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.16 with: tag: ${{ github.ref_name }} secrets: inherit diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2fbc462..7d6f2818 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: pull_request jobs: docker: - uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.15 + uses: freezingsaddles/freezing-web/.github/workflows/build-docker.yml@1.4.16 with: tag: latest-actions-build secrets: inherit