MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12253 from Budibase/fix-single-image-env 

Fix passing BUDIBASE_VERSION arg
This commit is contained in:
Michael Drury 2023-11-02 14:59:05 +00:00 committed by GitHub
parent 7526748d73 2ee77cda99
commit a44d2e2e22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/release-singleimage.yml vendored
View File

@ -66,7 +66,7 @@ jobs:
context: . context: .
push: true push: true
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
build-args: BUDIBASE_VERSION=$BUDIBASE_VERSION build-args: BUDIBASE_VERSION=${{ env.BUDIBASE_VERSION }}
tags: budibase/budibase,budibase/budibase:${{ env.RELEASE_VERSION }} tags: budibase/budibase,budibase/budibase:${{ env.RELEASE_VERSION }}
file: ./hosting/single/Dockerfile.v2 file: ./hosting/single/Dockerfile.v2
env: env:
@ -79,7 +79,7 @@ jobs:
platforms: linux/amd64 platforms: linux/amd64
build-args: | build-args: |
TARGETBUILD=aas TARGETBUILD=aas
BUDIBASE_VERSION=$BUDIBASE_VERSION BUDIBASE_VERSION=${{ env.BUDIBASE_VERSION }}
tags: budibase/budibase-aas,budibase/budibase-aas:${{ env.RELEASE_VERSION }} tags: budibase/budibase-aas,budibase/budibase-aas:${{ env.RELEASE_VERSION }}
file: ./hosting/single/Dockerfile.v2 file: ./hosting/single/Dockerfile.v2
env: env:

2
hosting/single/Dockerfile.v2
View File

@ -120,7 +120,7 @@ VOLUME /data
ARG BUDIBASE_VERSION ARG BUDIBASE_VERSION
# Ensuring the version argument is sent # Ensuring the version argument is sent
RUN test -n "$BUDIBASE_VERSION" RUN test -n "$BUDIBASE_VERSION"
ENV BUDIBASE_VERSION $BUDIBASE_VERSION ENV BUDIBASE_VERSION=$BUDIBASE_VERSION
HEALTHCHECK --interval=15s --timeout=15s --start-period=45s CMD "/healthcheck.sh" HEALTHCHECK --interval=15s --timeout=15s --start-period=45s CMD "/healthcheck.sh"