Skip to content

Commit 3b57c5c

Browse files
committed
Make java 21.0.3.fx-zulu default
1 parent 41cbc05 commit 3b57c5c

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ RUN mkdir -p ~/.terraform \
293293
&& printf "terraform -install-autocomplete 2> /dev/null\n" >>~/.bashrc
294294

295295
## Java
296-
ENV JAVA_VERSION=11.0.27.fx-zulu
296+
ENV JAVA_VERSION=21.0.3.fx-zulu
297297
RUN curl -fsSL "https://get.sdkman.io" | bash \
298298
&& bash -c ". /root/.sdkman/bin/sdkman-init.sh \
299299
&& sed -i 's/sdkman_selfupdate_enable=true/sdkman_selfupdate_enable=false/g' /root/.sdkman/etc/config \

dev/image/Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,17 @@ RUN install-packages netcat
123123

124124
USER gitpod
125125

126+
# Set up SDKMAN for gitpod user and ensure Java 21.0.3.fx-zulu is available
127+
RUN curl -s "https://get.sdkman.io" | bash \
128+
&& bash -c "source /home/gitpod/.sdkman/bin/sdkman-init.sh \
129+
&& sdk install java 21.0.3.fx-zulu \
130+
&& sdk default java 21.0.3.fx-zulu \
131+
&& sdk use java 21.0.3.fx-zulu"
132+
133+
# Set Java environment variables for gitpod user
134+
ENV JAVA_HOME=/home/gitpod/.sdkman/candidates/java/current
135+
ENV PATH=$JAVA_HOME/bin:$PATH
136+
126137
# Fix node version we develop against
127138
ARG GITPOD_NODE_VERSION=22.15.1
128139
RUN bash -c ". .nvm/nvm.sh \
@@ -133,6 +144,9 @@ ENV PATH=/home/gitpod/.nvm/versions/node/v${GITPOD_NODE_VERSION}/bin:$PATH
133144
## Register leeway autocompletion in bashrc
134145
RUN bash -c "echo . \<\(leeway bash-completion\) >> ~/.bashrc"
135146

147+
## Register SDKMAN initialization in bashrc
148+
RUN bash -c "echo 'source \"\$HOME/.sdkman/bin/sdkman-init.sh\"' >> ~/.bashrc"
149+
136150
### Google Cloud ###
137151
# not installed via repository as then 'docker-credential-gcr' is not available
138152
ARG GCS_DIR=/opt/google-cloud-sdk

0 commit comments

Comments
 (0)