From 59e908a41c0b048d44fd3c86d15166734db26f07 Mon Sep 17 00:00:00 2001 From: Michael Born Date: Thu, 9 Mar 2023 11:07:09 -0500 Subject: [PATCH 1/8] Pull latest CommandBox stable version in GH workflow --- .github/workflows/dockerimage.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 2d7341e..1e6a0aa 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -14,6 +14,13 @@ jobs: steps: - uses: actions/checkout@v2 + - id: get_box_version + run: | + curl --location -o https://s3.amazonaws.com/downloads.ortussolutions.com/ortussolutions/commandbox/box-repo.json + echo "json=`cat box-repo.json`" >> $GITHUB_OUTPUT + - run: | + echo "BOX_VERSION=${{fromJson(steps.get_box_version.outputs.json).versioning.stableVersion}}" >> $GITHUB_ENV + - run: echo ${{ env.BOX_VERSION }} - name: Build and Publish the Docker image run: | date_version=$(date +%Y.%m) From 50cb5ea7c4ec1a919f1120ec6fd905ba9fb0d314 Mon Sep 17 00:00:00 2001 From: Michael Born Date: Thu, 9 Mar 2023 11:11:21 -0500 Subject: [PATCH 2/8] Pass box version to Dockerfile for builds --- .github/workflows/dockerimage.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 1e6a0aa..9a21acc 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -25,7 +25,7 @@ jobs: run: | date_version=$(date +%Y.%m) echo $date_version > ./version.txt - docker build . --file Dockerfile --tag minibox + docker build . --file Dockerfile --tag minibox -e BOX_VERSION=${{ env.BOX_VERSION }} docker-compose build docker-compose up echo "${{ secrets.DOCKER_PASS }}" | docker login --username ${{ secrets.DOCKER_USER }} --password-stdin diff --git a/Dockerfile b/Dockerfile index ee31672..f742fbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM azul/zulu-openjdk-alpine:8-jre AS build RUN apk add zip unzip curl RUN mkdir /opt/box -RUN curl --location -o /opt/box/box https://s3.amazonaws.com/downloads.ortussolutions.com/ortussolutions/commandbox/5.8.0/box-light +RUN curl --location -o /opt/box/box https://s3.amazonaws.com/downloads.ortussolutions.com/ortussolutions/commandbox/$BOX_VERSION/box-light RUN chmod -R a+rx /opt/box/box From 9d4b26d7965afde8b85de0b9d2db564e64c3493f Mon Sep 17 00:00:00 2001 From: Michael Born Date: Thu, 9 Mar 2023 11:13:00 -0500 Subject: [PATCH 3/8] Trigger workflow build --- .github/workflows/dockerimage.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 9a21acc..bc9b567 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -44,6 +44,4 @@ jobs: docker push $IMAGE_ID:latest date_version=$(date +%Y.%m) docker tag minibox $IMAGE_ID:$date_version - docker push $IMAGE_ID:$date_version - - + docker push $IMAGE_ID:$date_version \ No newline at end of file From 4b8a877e4a69eb7e6c06d15c8f38595956493e1a Mon Sep 17 00:00:00 2001 From: Michael Born Date: Thu, 9 Mar 2023 11:15:22 -0500 Subject: [PATCH 4/8] Fix curl download syntax --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index bc9b567..13aefde 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v2 - id: get_box_version run: | - curl --location -o https://s3.amazonaws.com/downloads.ortussolutions.com/ortussolutions/commandbox/box-repo.json + curl --location -O https://s3.amazonaws.com/downloads.ortussolutions.com/ortussolutions/commandbox/box-repo.json echo "json=`cat box-repo.json`" >> $GITHUB_OUTPUT - run: | echo "BOX_VERSION=${{fromJson(steps.get_box_version.outputs.json).versioning.stableVersion}}" >> $GITHUB_ENV From 93c131a60a1b4e41e9da538f2594c8360b188db2 Mon Sep 17 00:00:00 2001 From: Michael Born Date: Thu, 9 Mar 2023 11:24:18 -0500 Subject: [PATCH 5/8] Use jq to read box version from json --- .github/workflows/dockerimage.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 13aefde..74ec9b2 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -14,13 +14,18 @@ jobs: steps: - uses: actions/checkout@v2 - - id: get_box_version - run: | - curl --location -O https://s3.amazonaws.com/downloads.ortussolutions.com/ortussolutions/commandbox/box-repo.json - echo "json=`cat box-repo.json`" >> $GITHUB_OUTPUT - - run: | - echo "BOX_VERSION=${{fromJson(steps.get_box_version.outputs.json).versioning.stableVersion}}" >> $GITHUB_ENV + - run: curl --location -O https://s3.amazonaws.com/downloads.ortussolutions.com/ortussolutions/commandbox/box-repo.json + + - name: Extract version from box-repo.json + uses: sergeysova/jq-action@v2 + id: version + with: + cmd: 'jq .versioning.stableVersion box-repo.json' + + - run: echo "BOX_VERSION=${{ steps.version.outputs.value }}" >> $GITHUB_ENV + - run: echo ${{ env.BOX_VERSION }} + - name: Build and Publish the Docker image run: | date_version=$(date +%Y.%m) From 6d9de42618a143906f84f8b85998909d6ba099d2 Mon Sep 17 00:00:00 2001 From: Michael Born Date: Thu, 9 Mar 2023 11:30:52 -0500 Subject: [PATCH 6/8] Set BOX_VERSION as build arg, not env var --- .github/workflows/dockerimage.yml | 2 +- Dockerfile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 74ec9b2..72c717a 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -30,7 +30,7 @@ jobs: run: | date_version=$(date +%Y.%m) echo $date_version > ./version.txt - docker build . --file Dockerfile --tag minibox -e BOX_VERSION=${{ env.BOX_VERSION }} + docker build . --file Dockerfile --tag minibox --build-arg BOX_VERSION=${{ env.BOX_VERSION }} docker-compose build docker-compose up echo "${{ secrets.DOCKER_PASS }}" | docker login --username ${{ secrets.DOCKER_USER }} --password-stdin diff --git a/Dockerfile b/Dockerfile index f742fbe..1b5c247 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,8 @@ FROM azul/zulu-openjdk-alpine:8-jre AS build RUN apk add zip unzip curl +ARG BOX_VERSION = 5.8.0 + RUN mkdir /opt/box RUN curl --location -o /opt/box/box https://s3.amazonaws.com/downloads.ortussolutions.com/ortussolutions/commandbox/$BOX_VERSION/box-light From 922236d4069d4b3f052a4830c005ab0f1cdb3e5b Mon Sep 17 00:00:00 2001 From: Michael Born Date: Thu, 9 Mar 2023 11:32:42 -0500 Subject: [PATCH 7/8] Fix Dockerfile ARG syntax --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1b5c247..159a224 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM azul/zulu-openjdk-alpine:8-jre AS build RUN apk add zip unzip curl -ARG BOX_VERSION = 5.8.0 +ARG BOX_VERSION=5.8.0 RUN mkdir /opt/box RUN curl --location -o /opt/box/box https://s3.amazonaws.com/downloads.ortussolutions.com/ortussolutions/commandbox/$BOX_VERSION/box-light From 00ebd071b602691745484ed41f413866588a5a04 Mon Sep 17 00:00:00 2001 From: Michael Born Date: Fri, 10 Mar 2023 22:03:58 -0500 Subject: [PATCH 8/8] Use BOX_VERSION variable to download box-thin --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 159a224..40be308 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,7 @@ RUN rm -f /root/.CommandBox/engine/cfml/cli/cfml-web/context/lucee-applet.jar RUN rm -f /root/.CommandBox/engine/cfml/cli/cfml-web/context/lucee-admin.lar RUN rm -f /root/.CommandBox/engine/cfml/cli/cfml-web/context/lucee-doc.lar -RUN curl --location -o /opt/box/box-thin https://s3.amazonaws.com/downloads.ortussolutions.com/ortussolutions/commandbox/5.8.0/box-thin +RUN curl --location -o /opt/box/box-thin https://s3.amazonaws.com/downloads.ortussolutions.com/ortussolutions/commandbox/$BOX_VERSION/box-thin RUN mv /opt/box/box-thin /opt/box/box