diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 2d7341e..72c717a 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -14,11 +14,23 @@ jobs: steps: - uses: actions/checkout@v2 + - 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) echo $date_version > ./version.txt - docker build . --file Dockerfile --tag minibox + 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 @@ -37,6 +49,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 diff --git a/Dockerfile b/Dockerfile index ee31672..40be308 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,10 @@ 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/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 @@ -48,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