java 17

yegor256 · Oct 24, 2024 · 508ba9b · 508ba9b
1 parent 83970cb
commit 508ba9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/docker/java/Dockerfile b/docker/java/Dockerfile
@@ -29,19 +29,15 @@
 FROM yegor256/rultor-ruby
 LABEL Description="RULTOR image for simple Java+Maven projects" Version="0.0.0"
 
-RUN apt-get -y --no-install-recommends install \
-    wget=* \
-  && apt-get clean
-
 ENV MAVEN_OPTS=-Xmx1g
 ENV JAVA_OPTS=-Xmx1g
 ENV JAVA_HOME=/usr/lib/jvm/java-17
-RUN apt-get -y install ca-certificates openjdk-11-jdk openjdk-17-jdk \
-  && update-java-alternatives --set $(ls /usr/lib/jvm | grep java-1.11) \
-  && ln -s "/usr/lib/jvm/$(ls /usr/lib/jvm | grep java-1.11)" /usr/lib/jvm/java-11 \
+RUN apt-get -y --fix-missing update \
+  && apt-get -y --no-install-recommends install wget=* ca-certificates=* openjdk-17-jdk=* \
+  && apt-get clean \
   && ln -s "/usr/lib/jvm/$(ls /usr/lib/jvm | grep java-1.17)" /usr/lib/jvm/java-17 \
-  && echo 'export JAVA_HOME=/usr/lib/jvm/java-11' >> /root/.profile \
-  && bash -c '[[ "$(javac  --version)" =~ "11.0" ]]'
+  && echo 'export JAVA_HOME=/usr/lib/jvm/java-17' >> /root/.profile \
+  && bash -c '[[ "$(javac  --version)" =~ "17.0" ]]'
 
 ENV MAVEN_VERSION=3.9.6
 ENV M2_HOME=/usr/local/apache-maven/apache-maven-${MAVEN_VERSION}

diff --git a/docker/latex/Dockerfile b/docker/latex/Dockerfile
@@ -70,6 +70,7 @@ RUN apt-get -y -q update \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
-RUN bash -c 'gem install texsc texqc' \
-  && bash -c 'texsc --version' \
-  && bash -c 'texqc --version' \
+RUN bash -l -c ". /etc/profile.d/rvm.sh \
+  && gem install texsc texqc \
+  && texsc --version \
+  && texqc --version"