From 9f3a1c478a3006efaf0b40edebc653d6bd492b02 Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Thu, 26 Oct 2023 09:01:44 -0500 Subject: [PATCH 1/3] fix: java installation --- Docker/jenkins/Jenkins-CI-Worker/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Docker/jenkins/Jenkins-CI-Worker/Dockerfile b/Docker/jenkins/Jenkins-CI-Worker/Dockerfile index 9117123e1..c0310f75d 100644 --- a/Docker/jenkins/Jenkins-CI-Worker/Dockerfile +++ b/Docker/jenkins/Jenkins-CI-Worker/Dockerfile @@ -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 From 399b055b94e77960c28b07d5d1c97f198686a772 Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Thu, 26 Oct 2023 09:09:12 -0500 Subject: [PATCH 2/3] fix: git --- Docker/jenkins/Jenkins-Worker/Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Docker/jenkins/Jenkins-Worker/Dockerfile b/Docker/jenkins/Jenkins-Worker/Dockerfile index c31e54923..c824690de 100644 --- a/Docker/jenkins/Jenkins-Worker/Dockerfile +++ b/Docker/jenkins/Jenkins-Worker/Dockerfile @@ -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 \ @@ -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: # From 42267cb9a4e5cdbb17d9bb576244685d7f231693 Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Thu, 26 Oct 2023 09:31:22 -0500 Subject: [PATCH 3/3] feat: confirm installation --- Docker/jenkins/Jenkins-CI-Worker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker/jenkins/Jenkins-CI-Worker/Dockerfile b/Docker/jenkins/Jenkins-CI-Worker/Dockerfile index c0310f75d..8c5f7d424 100644 --- a/Docker/jenkins/Jenkins-CI-Worker/Dockerfile +++ b/Docker/jenkins/Jenkins-CI-Worker/Dockerfile @@ -92,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 && \