Skip to content

Commit 80d1168

Browse files
remove forcing version in build
1 parent b539a5f commit 80d1168

3 files changed

Lines changed: 10 additions & 11 deletions

File tree

Dockerfile

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ RUN git -c advice.detachedHead=0 clone --depth 1 https://github.com/pyenv/pyenv.
131131
&& src/configure \
132132
&& make -C src \
133133
&& pyenv install $PYTHON_VERSIONS \
134-
&& pyenv global "${PYTHON_VERSIONS%% *}" \
135134
&& rm -rf "$PYENV_ROOT/cache"
136135

137136
# Install pipx for common global package managers (e.g. poetry)
@@ -174,10 +173,10 @@ RUN --mount=type=cache,target=/root/.npm \
174173
&& echo "prettier\neslint\ntypescript" > $NVM_DIR/default-packages \
175174
&& . $NVM_DIR/nvm.sh \
176175
# The latest versions of npm aren't supported on node 18, so we install each set differently
177-
&& nvm install 18 && nvm use 18 && npm install -g npm@10.9 pnpm@10.12 && corepack enable && corepack install -g yarn \
178-
&& nvm install 20 && nvm use 20 && npm install -g npm@11.4 pnpm@10.12 && corepack enable && corepack install -g yarn \
179-
&& nvm install 22 && nvm use 22 && npm install -g npm@11.4 pnpm@10.12 && corepack enable && corepack install -g yarn \
180-
&& nvm install 24 && nvm use 24 && npm install -g npm@11.4 pnpm@10.12 && corepack enable && corepack install -g yarn \
176+
&& nvm install 18 && nvm use 18 && npm install -g npm@10.9 pnpm && corepack enable && corepack install -g yarn \
177+
&& nvm install 20 && nvm use 20 && npm install -g npm@11.4 pnpm && corepack enable && corepack install -g yarn \
178+
&& nvm install 22 && nvm use 22 && npm install -g npm@11.4 pnpm && corepack enable && corepack install -g yarn \
179+
&& nvm install 24 && nvm use 24 && npm install -g npm@11.4 pnpm && corepack enable && corepack install -g yarn \
181180
&& nvm alias default "$NODE_VERSION" \
182181
&& nvm cache clear \
183182
&& npm cache clean --force || true \
@@ -326,15 +325,15 @@ RUN chmod +x /opt/codex/setup_universal.sh
326325

327326
COPY verify.sh /opt/verify.sh
328327
RUN --network=none chmod +x /opt/verify.sh \
329-
&& bash -lc 'PYTHON_VERSIONS="$PYTHON_VERSIONS" \
330-
NODE_VERSIONS="18 20 22" \
328+
&& PYTHON_VERSIONS="$PYTHON_VERSIONS" \
329+
NODE_VERSIONS="24 22 20 18" \
331330
RUST_VERSIONS="$RUST_VERSIONS" \
332331
GO_VERSIONS="$GO_VERSIONS" \
333332
SWIFT_VERSIONS="$SWIFT_VERSIONS" \
334333
RUBY_VERSIONS="$RUBY_VERSIONS" \
335334
PHP_VERSIONS="$PHP_VERSIONS" \
336335
JAVA_VERSIONS="$( [ "$TARGETARCH" = "arm64" ] && echo "$ARM_JAVA_VERSIONS" || echo "$AMD_JAVA_VERSIONS" )" \
337-
"/opt/verify.sh"'
336+
"/opt/verify.sh"
338337

339338
### ENTRYPOINT ###
340339

setup_universal.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if [ -n "${CODEX_ENV_NODE_VERSION}" ]; then
3030
echo "# Node.js: v${CODEX_ENV_NODE_VERSION} (default: ${current})"
3131
if [ "${current}" != "v${CODEX_ENV_NODE_VERSION}" ]; then
3232
nvm alias default "${CODEX_ENV_NODE_VERSION}"
33-
nvm use "${CODEX_ENV_NODE_VERSION}"
33+
nvm use --save "${CODEX_ENV_NODE_VERSION}"
3434
corepack enable
3535
fi
3636
fi

verify.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ for ((i=max-1; i>=0; i--)); do
3333
CODEX_ENV_RUBY_VERSION=${RUBY[i]:-${RUBY[0]}} \
3434
CODEX_ENV_PHP_VERSION=${PHP[i]:-${PHP[0]}} \
3535
CODEX_ENV_JAVA_VERSION=${JAVA[i]:-${JAVA[0]}} \
36-
bash -c '
36+
bash -lc '
3737
printf "\n\nTesting setup_universal with versions:\n"
3838
env | grep "^CODEX_ENV_" | sort
3939
printf "\n"
40-
exec /opt/codex/setup_universal.sh
40+
/opt/codex/setup_universal.sh
4141
'
4242
done
4343

0 commit comments

Comments
 (0)