From 0cc7cc67a388db38fbb03bbcf2adb1ce3ed3b364 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 23 Oct 2023 13:53:18 +0200 Subject: [PATCH] Renames --- .github/workflows/release-singleimage-test.yml | 4 ++-- hosting/docker-compose.build.yaml | 4 ++-- hosting/single/Dockerfile.v2 | 6 +++--- packages/server/Dockerfile.v2 | 6 +++--- packages/server/package.json | 2 +- packages/worker/Dockerfile.v2 | 6 +++--- packages/worker/package.json | 2 +- scripts/build-single-image.sh | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release-singleimage-test.yml b/.github/workflows/release-singleimage-test.yml index 3d6c0d2b3c..c3a14226ce 100644 --- a/.github/workflows/release-singleimage-test.yml +++ b/.github/workflows/release-singleimage-test.yml @@ -54,7 +54,7 @@ jobs: push: true pull: true platforms: linux/amd64,linux/arm64 - build-args: VERSION=0.0.0+test + build-args: BUDIBASE_VERSION=0.0.0+test tags: budibase/budibase-test:test file: ./hosting/single/Dockerfile.v2 cache-from: type=registry,ref=budibase/budibase-test:test @@ -67,6 +67,6 @@ jobs: platforms: linux/amd64 build-args: | TARGETBUILD=aas - VERSION=0.0.0+test + BUDIBASE_VERSION=0.0.0+test tags: budibase/budibase-test:aas file: ./hosting/single/Dockerfile.v2 diff --git a/hosting/docker-compose.build.yaml b/hosting/docker-compose.build.yaml index 19ce9b5473..7ead001a1c 100644 --- a/hosting/docker-compose.build.yaml +++ b/hosting/docker-compose.build.yaml @@ -8,7 +8,7 @@ services: context: .. dockerfile: packages/server/Dockerfile.v2 args: - - VERSION=0.0.0+dev-docker + - BUDIBASE_VERSION=0.0.0+dev-docker container_name: build-bbapps environment: SELF_HOSTED: 1 @@ -38,7 +38,7 @@ services: context: .. dockerfile: packages/worker/Dockerfile.v2 args: - - VERSION=0.0.0+dev-docker + - BUDIBASE_VERSION=0.0.0+dev-docker container_name: build-bbworker environment: SELF_HOSTED: 1 diff --git a/hosting/single/Dockerfile.v2 b/hosting/single/Dockerfile.v2 index ecc223be15..3b994ce0e6 100644 --- a/hosting/single/Dockerfile.v2 +++ b/hosting/single/Dockerfile.v2 @@ -118,9 +118,9 @@ EXPOSE 443 EXPOSE 2222 VOLUME /data -ARG VERSION -RUN test -n "$VERSION" -ENV VERSION=$VERSION +ARG BUDIBASE_VERSION +RUN test -n "$BUDIBASE_VERSION" +ENV BUDIBASE_VERSION=$VERSION HEALTHCHECK --interval=15s --timeout=15s --start-period=45s CMD "/healthcheck.sh" diff --git a/packages/server/Dockerfile.v2 b/packages/server/Dockerfile.v2 index 339cefcc45..341fe5ee34 100644 --- a/packages/server/Dockerfile.v2 +++ b/packages/server/Dockerfile.v2 @@ -67,9 +67,9 @@ COPY packages/server/docker_run.sh . COPY packages/server/builder/ builder/ COPY packages/server/client/ client/ -ARG VERSION -RUN test -n "$VERSION" -ENV VERSION=$VERSION +ARG BUDIBASE_VERSION +RUN test -n "$BUDIBASE_VERSION" +ENV BUDIBASE_VERSION=$VERSION EXPOSE 4001 diff --git a/packages/server/package.json b/packages/server/package.json index 0636eebe77..4a858f3be9 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -18,7 +18,7 @@ "test": "bash scripts/test.sh", "test:memory": "jest --maxWorkers=2 --logHeapUsage --forceExit", "test:watch": "jest --watch", - "build:docker": "yarn build && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION --build-arg VERSION=$BUDIBASE_RELEASE_VERSION", + "build:docker": "yarn build && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION --build-arg BUDIBASE_VERSION=$BUDIBASE_RELEASE_VERSION", "run:docker": "node dist/index.js", "run:docker:cluster": "pm2-runtime start pm2.config.js", "dev:stack:up": "node scripts/dev/manage.js up", diff --git a/packages/worker/Dockerfile.v2 b/packages/worker/Dockerfile.v2 index 20fcd4a69b..ed3817e89d 100644 --- a/packages/worker/Dockerfile.v2 +++ b/packages/worker/Dockerfile.v2 @@ -50,8 +50,8 @@ ENV POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU ENV TENANT_FEATURE_FLAGS=*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR ENV ACCOUNT_PORTAL_URL=https://account.budibase.app -ARG VERSION -RUN test -n "$VERSION" -ENV VERSION=$VERSION +ARG BUDIBASE_VERSION +RUN test -n "$BUDIBASE_VERSION" +ENV BUDIBASE_VERSION=$VERSION CMD ["./docker_run.sh"] diff --git a/packages/worker/package.json b/packages/worker/package.json index 0a75eac522..205bf3309a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -20,7 +20,7 @@ "run:docker": "node dist/index.js", "debug": "yarn build && node --expose-gc --inspect=9223 dist/index.js", "run:docker:cluster": "pm2-runtime start pm2.config.js", - "build:docker": "yarn build && docker build . -t worker-service --label version=$BUDIBASE_RELEASE_VERSION --build-arg VERSION=$BUDIBASE_RELEASE_VERSION", + "build:docker": "yarn build && docker build . -t worker-service --label version=$BUDIBASE_RELEASE_VERSION --build-arg BUDIBASE_VERSION=$BUDIBASE_RELEASE_VERSION", "dev:stack:init": "node ./scripts/dev/manage.js init", "dev:builder": "npm run dev:stack:init && nodemon", "dev:built": "yarn run dev:stack:init && yarn run run:docker", diff --git a/scripts/build-single-image.sh b/scripts/build-single-image.sh index 216d758fae..ed3d9a8ed6 100755 --- a/scripts/build-single-image.sh +++ b/scripts/build-single-image.sh @@ -1,4 +1,4 @@ #!/bin/bash yarn build --scope @budibase/server --scope @budibase/worker version=$(./scripts/getCurrentVersion.sh) -docker build -f hosting/single/Dockerfile.v2 -t budibase:latest --build-arg VERSION=$version . +docker build -f hosting/single/Dockerfile.v2 -t budibase:latest --build-arg BUDIBASE_VERSION=$version .