From f1f618c57a5658d93935602b6a9ef7f9bb1b48f8 Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Mon, 13 Nov 2023 11:56:04 -0600 Subject: [PATCH] Don't change the next.js version by default. (#640) --- .../data/container-build/cerc-nextjs-base/Dockerfile.webapp | 2 +- .../container-build/cerc-nextjs-base/scripts/build-app.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stack_orchestrator/data/container-build/cerc-nextjs-base/Dockerfile.webapp b/stack_orchestrator/data/container-build/cerc-nextjs-base/Dockerfile.webapp index 23f42385..51664deb 100644 --- a/stack_orchestrator/data/container-build/cerc-nextjs-base/Dockerfile.webapp +++ b/stack_orchestrator/data/container-build/cerc-nextjs-base/Dockerfile.webapp @@ -1,6 +1,6 @@ FROM cerc/nextjs-base:local -ARG CERC_NEXT_VERSION=latest +ARG CERC_NEXT_VERSION=keep ARG CERC_BUILD_TOOL WORKDIR /app diff --git a/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/build-app.sh b/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/build-app.sh index 83977268..e62bc0d0 100755 --- a/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/build-app.sh +++ b/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/build-app.sh @@ -4,7 +4,7 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then set -x fi -CERC_NEXT_VERSION="${CERC_NEXT_VERSION:-^14.0.2}" +CERC_NEXT_VERSION="${CERC_NEXT_VERSION:-keep}" CERC_BUILD_TOOL="${CERC_BUILD_TOOL}" if [ -z "$CERC_BUILD_TOOL" ]; then if [ -f "yarn.lock" ] && [ ! -f "package-lock.json" ]; then @@ -101,8 +101,10 @@ cat package.dist | jq '.scripts.cerc_compile = "next experimental-compile"' | jq CUR_NEXT_VERSION="`jq -r '.dependencies.next' package.json`" if [ "$CERC_NEXT_VERSION" != "keep" ] && [ "$CUR_NEXT_VERSION" != "$CERC_NEXT_VERSION" ]; then - echo "Changing 'next' version from $CUR_NEXT_VERSION to $CERC_NEXT_VERSION (set with --build-arg CERC_NEXT_VERSION)" + echo "Changing 'next' version specifier from '$CUR_NEXT_VERSION' to '$CERC_NEXT_VERSION' (set with --build-arg CERC_NEXT_VERSION)" cat package.json | jq ".dependencies.next = \"$CERC_NEXT_VERSION\"" | sponge package.json +else + echo "'next' version specifier '$CUR_NEXT_VERSION' (override with --build-arg CERC_NEXT_VERSION)" fi $CERC_BUILD_TOOL install || exit 1