Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Score-client JDK update from 11 to 17 #353

Merged
merged 1 commit into from
Apr 3, 2023
Merged

Score-client JDK update from 11 to 17 #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN cd score-client/target \
FROM ubuntu:18.04 as client

ENV CLIENT_DIST_DIR /score-client-dist
ENV JDK_DOWNLOAD_URL https://download.java.net/openjdk/jdk11/ri/openjdk-11+28_linux-x64_bin.tar.gz
ENV JDK_DOWNLOAD_URL https://download.java.net/openjdk/jdk17/ri/openjdk-17+35_linux-x64_bin.tar.gz
ENV SCORE_CLIENT_HOME /score-client
ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCORE_CLIENT_HOME/bin
ENV SCORE_USER score
Expand All @@ -51,20 +51,20 @@ RUN useradd $SCORE_USER \
# Copy client dist from previous docker build staget
COPY --from=builder $CLIENT_DIST_DIR/ $SCORE_CLIENT_HOME

# Install Open JDK 11, and remove unused things at runtime
# Install Open JDK 17, and remove unused things at runtime
RUN mkdir /usr/lib/jvm \
&& cd /usr/lib/jvm \
&& wget $JDK_DOWNLOAD_URL -O openjdk11.tar.gz \
&& tar zxvf openjdk11.tar.gz \
&& rm -rf openjdk11.tar.gz \
&& echo 'PATH=$PATH:/usr/lib/jvm/jdk-11/bin' >> /etc/environment \
&& echo 'JAVA_HOME=/usr/lib/jvm/jdk-11' >> /etc/environment \
&& rm -rf /usr/lib/jvm/jdk-11/jmods \
&& rm -rf /usr/lib/jvm/jdk-11/lib/src.zip \
&& update-alternatives --install "/usr/bin/java" "java" "/usr/lib/jvm/jdk-11/bin/java" 0 \
&& update-alternatives --install "/usr/bin/javac" "javac" "/usr/lib/jvm/jdk-11/bin/javac" 0 \
&& update-alternatives --set java /usr/lib/jvm/jdk-11/bin/java \
&& update-alternatives --set javac /usr/lib/jvm/jdk-11/bin/javac \
&& wget $JDK_DOWNLOAD_URL -O openjdk17.tar.gz \
&& tar zxvf openjdk17.tar.gz \
&& rm -rf openjdk17.tar.gz \
&& echo 'PATH=$PATH:/usr/lib/jvm/jdk-17/bin' >> /etc/environment \
&& echo 'JAVA_HOME=/usr/lib/jvm/jdk-17' >> /etc/environment \
&& rm -rf /usr/lib/jvm/jdk-17/jmods \
&& rm -rf /usr/lib/jvm/jdk-17/lib/src.zip \
&& update-alternatives --install "/usr/bin/java" "java" "/usr/lib/jvm/jdk-17/bin/java" 0 \
&& update-alternatives --install "/usr/bin/javac" "javac" "/usr/lib/jvm/jdk-17/bin/javac" 0 \
&& update-alternatives --set java /usr/lib/jvm/jdk-17/bin/java \
&& update-alternatives --set javac /usr/lib/jvm/jdk-17/bin/javac \
&& update-alternatives --list java \
&& update-alternatives --list javac \
&& java -version \
Expand Down
26 changes: 13 additions & 13 deletions Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
FROM ubuntu:18.04 as client

ENV CLIENT_DIST_DIR /score-client-dist
ENV JDK_DOWNLOAD_URL https://download.java.net/openjdk/jdk11/ri/openjdk-11+28_linux-x64_bin.tar.gz
ENV JDK_DOWNLOAD_URL https://download.java.net/openjdk/jdk17/ri/openjdk-17+35_linux-x64_bin.tar.gz
ENV SCORE_CLIENT_HOME /score-client
ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCORE_CLIENT_HOME/bin
ENV SCORE_USER score
Expand All @@ -19,20 +19,20 @@ RUN useradd $SCORE_USER \

COPY score-client/target/score-client-*-dist.tar.gz /score-client.tar.gz

# Install Open JDK 11, and remove unused things at runtime
# Install Open JDK 17, and remove unused things at runtime
RUN mkdir /usr/lib/jvm \
&& cd /usr/lib/jvm \
&& wget $JDK_DOWNLOAD_URL -O openjdk11.tar.gz \
&& tar zxvf openjdk11.tar.gz \
&& rm -rf openjdk11.tar.gz \
&& echo 'PATH=$PATH:/usr/lib/jvm/jdk-11/bin' >> /etc/environment \
&& echo 'JAVA_HOME=/usr/lib/jvm/jdk-11' >> /etc/environment \
&& rm -rf /usr/lib/jvm/jdk-11/jmods \
&& rm -rf /usr/lib/jvm/jdk-11/lib/src.zip \
&& update-alternatives --install "/usr/bin/java" "java" "/usr/lib/jvm/jdk-11/bin/java" 0 \
&& update-alternatives --install "/usr/bin/javac" "javac" "/usr/lib/jvm/jdk-11/bin/javac" 0 \
&& update-alternatives --set java /usr/lib/jvm/jdk-11/bin/java \
&& update-alternatives --set javac /usr/lib/jvm/jdk-11/bin/javac \
&& wget $JDK_DOWNLOAD_URL -O openjdk17.tar.gz \
&& tar zxvf openjdk17.tar.gz \
&& rm -rf openjdk17.tar.gz \
&& echo 'PATH=$PATH:/usr/lib/jvm/jdk-17/bin' >> /etc/environment \
&& echo 'JAVA_HOME=/usr/lib/jvm/jdk-17' >> /etc/environment \
&& rm -rf /usr/lib/jvm/jdk-17/jmods \
&& rm -rf /usr/lib/jvm/jdk-17/lib/src.zip \
&& update-alternatives --install "/usr/bin/java" "java" "/usr/lib/jvm/jdk-17/bin/java" 0 \
&& update-alternatives --install "/usr/bin/javac" "javac" "/usr/lib/jvm/jdk-17/bin/javac" 0 \
&& update-alternatives --set java /usr/lib/jvm/jdk-17/bin/java \
&& update-alternatives --set javac /usr/lib/jvm/jdk-17/bin/javac \
&& update-alternatives --list java \
&& update-alternatives --list javac \
&& java -version
Expand Down
4 changes: 2 additions & 2 deletions score-client/src/main/java/bio/overture/score/client/command/DownloadCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,8 @@ private void validateParms() {
checkParameter(
Stream.of(!objectId.isEmpty(), manifestResource != null,analysisId != null && programId != null).
filter(i -> i == Boolean.TRUE).count() == 1,
"Only one of --object-id, --manifest, or --analysisId may be specified. "
+ "--studyId may only be used together with --analysisId, and is required if analysisId is specified.");
"Only one of --object-id, --manifest, or --analysis-id may be specified. "
+ "--study-id may only be used together with --analysis-id, and is required if analysis-id is specified.");
}
}