From 7f7154aa43c922c7bf949138772b195c65ca43ea Mon Sep 17 00:00:00 2001 From: Michael Storgaard Date: Thu, 24 Oct 2024 13:16:56 +0200 Subject: [PATCH] Added v22, bumped versions and disabled arm builds --- build-all.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/build-all.sh b/build-all.sh index df20cc1..c32e278 100755 --- a/build-all.sh +++ b/build-all.sh @@ -3,10 +3,12 @@ set -eux NODE_STABLE="20" -NODE_VERSIONS=${NODE_VERSIONS:="20.15.1 18.20.4"} +NODE_VERSIONS=${NODE_VERSIONS:="22.11.0 20.18.0 18.20.4"} YARN_VERSION=${YARN_VERSION:="1.22.19"} -NPM_VERSION=${NPM_VERSION:="10.8.1"} -BUILD_PLATFORMS=${BUILD_PLATFORMS:='linux/amd64 linux/arm64'} +NPM_VERSION=${NPM_VERSION:="10.9.0"} +# Disabled arm builds for now as they're only used locally +BUILD_PLATFORMS=${BUILD_PLATFORMS:='linux/amd64'} +# BUILD_PLATFORMS=${BUILD_PLATFORMS:='linux/amd64 linux/arm64'} # External variables PROJECT_ID=${PROJECT_ID:-} @@ -58,10 +60,11 @@ for NODE_VERSION in $NODE_VERSIONS; do docker buildx build --platform="${PLATFORM}" --progress=plain --target=builder --load --tag="europe-west1-docker.pkg.dev/connectedcars-build/node-builder/${BRANCH_NAME}:${NODE_VERSION}" ${DOCKER_NODE_BUILD_ARGS} . docker buildx build --platform="${PLATFORM}" --progress=plain --target=fat-base --load --tag="europe-west1-docker.pkg.dev/connectedcars-build/node-fat-base/${BRANCH_NAME}:${NODE_VERSION}" ${DOCKER_NODE_BUILD_ARGS} . - echo "Building test image with old docker build for node $NODE_VERSION for $PLATFORM" - DOCKER_BUILDKIT=0 docker build --platform="${PLATFORM}" --tag="test:${NODE_VERSION}" --build-arg=NODE_VERSION="${NODE_VERSION}" --build-arg=BRANCH_NAME="${BRANCH_NAME}" --build-arg=NPM_TOKEN="${NPM_TOKEN}" -f test/Dockerfile.old test/ - echo "Running test image for node $NODE_VERSION for $PLATFORM" - docker run --platform="${PLATFORM}" "test:${NODE_VERSION}" + # These builds are no longer necessary since we use buildx + # echo "Building test image with old docker build for node $NODE_VERSION for $PLATFORM" + # DOCKER_BUILDKIT=0 docker build --platform="${PLATFORM}" --tag="test:${NODE_VERSION}" --build-arg=NODE_VERSION="${NODE_VERSION}" --build-arg=BRANCH_NAME="${BRANCH_NAME}" --build-arg=NPM_TOKEN="${NPM_TOKEN}" -f test/Dockerfile.old test/ + # echo "Running test image for node $NODE_VERSION for $PLATFORM" + # docker run --platform="${PLATFORM}" "test:${NODE_VERSION}" echo "Building test image with buildx for node $NODE_VERSION for $PLATFORM" # For some reason the multi arch builder does not have access to the