Skip to content

Commit 4f0437a

Browse files
remove forcing version in build
1 parent b539a5f commit 4f0437a

1 file changed

Lines changed: 3 additions & 11 deletions

File tree

Dockerfile

Lines changed: 3 additions & 11 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)
@@ -203,7 +202,6 @@ ARG ARM_JAVA_VERSIONS="25 24 23 22 21 17"
203202
RUN --mount=type=cache,target=/root/.cache/mise \
204203
JAVA_VERSIONS="$( [ "$TARGETARCH" = "arm64" ] && echo "$ARM_JAVA_VERSIONS" || echo "$AMD_JAVA_VERSIONS" )" \
205204
&& for v in $JAVA_VERSIONS; do mise install "java@${v}"; done \
206-
&& mise use --global "java@${JAVA_VERSIONS%% *}" \
207205
&& mise use --global "gradle@${GRADLE_VERSION}" \
208206
&& mise use --global "maven@${MAVEN_VERSION}" \
209207
&& mise cache clear || true
@@ -221,9 +219,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
221219
&& ./swiftly init --quiet-shell-followup \
222220
&& for v in $SWIFT_VERSIONS; do \
223221
swiftly install "$v"; \
224-
done \
225-
&& swiftly use "${SWIFT_VERSIONS%% *}"
226-
222+
done
227223
### RUST ###
228224

229225
ARG RUST_VERSIONS="1.92.0 1.91.1 1.90.0 1.89.0 1.88.0 1.87.0 1.86.0 1.85.1 1.84.1 1.83.0"
@@ -232,9 +228,7 @@ RUN --mount=type=cache,target=/root/.cargo/registry \
232228
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain none \
233229
&& . "$HOME/.cargo/env" \
234230
&& echo 'source $HOME/.cargo/env' >> /etc/profile \
235-
&& rustup toolchain install $RUST_VERSIONS --profile minimal --component rustfmt --component clippy \
236-
&& rustup default ${RUST_VERSIONS%% *}
237-
231+
&& rustup toolchain install $RUST_VERSIONS --profile minimal --component rustfmt --component clippy
238232
### RUBY ###
239233

240234
ARG RUBY_VERSIONS="3.4.4 3.3.8 3.2.3"
@@ -246,7 +240,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
246240
libgmp-dev=2:6.3.* \
247241
&& rm -rf /var/lib/apt/lists/* \
248242
&& for v in $RUBY_VERSIONS; do mise install "ruby@${v}"; done \
249-
&& mise use --global "ruby@${RUBY_VERSIONS%% *}" \
250243
&& mise cache clear || true;
251244

252245
### C++ ###
@@ -272,7 +265,6 @@ ARG GOLANG_CI_LINT_VERSION=2.1.6
272265
ENV PATH=/usr/local/go/bin:$HOME/go/bin:$PATH
273266
RUN --mount=type=cache,target=/root/.cache/mise \
274267
for v in $GO_VERSIONS; do mise install "go@${v}"; done \
275-
&& mise use --global "go@${GO_VERSIONS%% *}" \
276268
&& mise use --global "golangci-lint@${GOLANG_CI_LINT_VERSION}" \
277269
&& mise cache clear || true
278270

@@ -327,7 +319,7 @@ RUN chmod +x /opt/codex/setup_universal.sh
327319
COPY verify.sh /opt/verify.sh
328320
RUN --network=none chmod +x /opt/verify.sh \
329321
&& bash -lc 'PYTHON_VERSIONS="$PYTHON_VERSIONS" \
330-
NODE_VERSIONS="18 20 22" \
322+
NODE_VERSIONS="24 22 20 18" \
331323
RUST_VERSIONS="$RUST_VERSIONS" \
332324
GO_VERSIONS="$GO_VERSIONS" \
333325
SWIFT_VERSIONS="$SWIFT_VERSIONS" \

0 commit comments

Comments
 (0)