Skip to content

Commit

Permalink
fix: java installation (#2394)
Browse files Browse the repository at this point in the history
* fix: java installation

* fix: git

* feat: confirm installation
  • Loading branch information
m0nhawk authored Oct 26, 2023
1 parent 333d242 commit 7c45e64
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
5 changes: 2 additions & 3 deletions Docker/jenkins/Jenkins-CI-Worker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@ RUN set -xe && apt-get update \
zlib1g-dev \
zsh \
ca-certificates-java \
openjdk-11-jre-headless \
&& ln -s /usr/bin/lua5.3 /usr/local/bin/lua

# Use jdk11
ENV JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64"
ENV JAVA_HOME="/opt/java/openjdk"
ENV PATH="$JAVA_HOME/bin:$PATH"

COPY ./certfix.sh /certfix.sh
Expand Down Expand Up @@ -93,7 +92,7 @@ RUN chmod +x /root/tmp/install-python3.8.sh; sync && \
unlink /usr/bin/python3 && \
ln -s /usr/local/bin/python3.8 /usr/bin/python3

RUN apt-get install python3-distutils
RUN apt-get install -y python3-distutils

# Fix shebang for lsb_release
RUN sed -i 's/python3/python3.8/' /usr/bin/lsb_release && \
Expand Down
6 changes: 1 addition & 5 deletions Docker/jenkins/Jenkins-Worker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ RUN set -xe && apt-get update && apt-get install -y apt-utils dnsutils build-ess

RUN apt-get update \
&& apt-get install -y lsb-release \
git \
apt-transport-https \
r-base \
libffi-dev \
Expand Down Expand Up @@ -36,11 +37,6 @@ RUN apt-get update \
# install Ruby.
RUN apt-get install -y ruby-full

# install GIT from buster-backports
RUN echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/buster-backports.list \
&& apt-get update \
&& apt-get -t=buster-backports -y install git=1:2.30.*

#
# install docker tools:
#
Expand Down

0 comments on commit 7c45e64

Please sign in to comment.