Skip to content

Commit 6f8823c

Browse files
alecharpalecharp
authored
Updates Java 11 to Java 17 for test environment (#487)
1 parent c3b77e1 commit 6f8823c

File tree

17 files changed

+34
-34
lines changed

17 files changed

+34
-34
lines changed

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-curve25519-sha256/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1414
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1515
&& apt-get update -y -qq \
1616
&& apt-get install -y -qq \
17-
openjdk-11-jdk \
17+
openjdk-17-jdk \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -38,7 +38,7 @@ RUN echo "password\npassword" | passwd root \
3838
&& echo "password\npassword" | passwd jenkins
3939

4040
EXPOSE 22
41-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
41+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4242
RUN echo "PATH=${PATH}" >> /etc/environment
4343
ENTRYPOINT []
4444
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-dsa/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1414
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1515
&& apt-get update -y -qq \
1616
&& apt-get install -y -qq \
17-
openjdk-11-jdk \
17+
openjdk-17-jdk \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -38,7 +38,7 @@ RUN echo "password\npassword" | passwd root \
3838
&& echo "password\npassword" | passwd jenkins
3939

4040
EXPOSE 22
41-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
41+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4242
RUN echo "PATH=${PATH}" >> /etc/environment
4343
ENTRYPOINT []
4444
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ec/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1414
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1515
&& apt-get update -y -qq \
1616
&& apt-get install -y -qq \
17-
openjdk-11-jdk \
17+
openjdk-17-jdk \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -38,7 +38,7 @@ RUN echo "password\npassword" | passwd root \
3838
&& echo "password\npassword" | passwd jenkins
3939

4040
EXPOSE 22
41-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
41+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4242
RUN echo "PATH=${PATH}" >> /etc/environment
4343
ENTRYPOINT []
4444
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp256/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1414
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1515
&& apt-get update -y -qq \
1616
&& apt-get install -y -qq \
17-
openjdk-11-jdk \
17+
openjdk-17-jdk \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -38,7 +38,7 @@ RUN echo "password\npassword" | passwd root \
3838
&& echo "password\npassword" | passwd jenkins
3939

4040
EXPOSE 22
41-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
41+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4242
RUN echo "PATH=${PATH}" >> /etc/environment
4343
ENTRYPOINT []
4444
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp384/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1414
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1515
&& apt-get update -y -qq \
1616
&& apt-get install -y -qq \
17-
openjdk-11-jdk \
17+
openjdk-17-jdk \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -38,7 +38,7 @@ RUN echo "password\npassword" | passwd root \
3838
&& echo "password\npassword" | passwd jenkins
3939

4040
EXPOSE 22
41-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
41+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4242
RUN echo "PATH=${PATH}" >> /etc/environment
4343
ENTRYPOINT []
4444
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp521/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1414
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1515
&& apt-get update -y -qq \
1616
&& apt-get install -y -qq \
17-
openjdk-11-jdk \
17+
openjdk-17-jdk \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -38,7 +38,7 @@ RUN echo "password\npassword" | passwd root \
3838
&& echo "password\npassword" | passwd jenkins
3939

4040
EXPOSE 22
41-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
41+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4242
RUN echo "PATH=${PATH}" >> /etc/environment
4343
ENTRYPOINT []
4444
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ed25519/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1414
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1515
&& apt-get update -y -qq \
1616
&& apt-get install -y -qq \
17-
openjdk-11-jdk \
17+
openjdk-17-jdk \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -38,7 +38,7 @@ RUN echo "password\npassword" | passwd root \
3838
&& echo "password\npassword" | passwd jenkins
3939

4040
EXPOSE 22
41-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
41+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4242
RUN echo "PATH=${PATH}" >> /etc/environment
4343
ENTRYPOINT []
4444
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ec/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1414
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1515
&& apt-get update -y -qq \
1616
&& apt-get install -y -qq \
17-
openjdk-11-jdk \
17+
openjdk-17-jdk \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -38,7 +38,7 @@ RUN echo "password\npassword" | passwd root \
3838
&& echo "password\npassword" | passwd jenkins
3939

4040
EXPOSE 22
41-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
41+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4242
RUN echo "PATH=${PATH}" >> /etc/environment
4343
ENTRYPOINT []
4444
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ed/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1414
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1515
&& apt-get update -y -qq \
1616
&& apt-get install -y -qq \
17-
openjdk-11-jdk \
17+
openjdk-17-jdk \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -38,7 +38,7 @@ RUN echo "password\npassword" | passwd root \
3838
&& echo "password\npassword" | passwd jenkins
3939

4040
EXPOSE 22
41-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
41+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4242
RUN echo "PATH=${PATH}" >> /etc/environment
4343
ENTRYPOINT []
4444
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-rsa/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1414
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1515
&& apt-get update -y -qq \
1616
&& apt-get install -y -qq \
17-
openjdk-11-jdk \
17+
openjdk-17-jdk \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -38,7 +38,7 @@ RUN echo "password\npassword" | passwd root \
3838
&& echo "password\npassword" | passwd jenkins
3939

4040
EXPOSE 22
41-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
41+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4242
RUN echo "PATH=${PATH}" >> /etc/environment
4343
ENTRYPOINT []
4444
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1414
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1515
&& apt-get update -y -qq \
1616
&& apt-get install -y -qq \
17-
openjdk-11-jdk \
17+
openjdk-17-jdk \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -38,7 +38,7 @@ RUN echo "password\npassword" | passwd root \
3838
&& echo "password\npassword" | passwd jenkins
3939

4040
EXPOSE 22
41-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
41+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4242
RUN echo "PATH=${PATH}" >> /etc/environment
4343
ENTRYPOINT []
4444
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa256/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1414
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1515
&& apt-get update -y -qq \
1616
&& apt-get install -y -qq \
17-
openjdk-11-jdk \
17+
openjdk-17-jdk \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -38,7 +38,7 @@ RUN echo "password\npassword" | passwd root \
3838
&& echo "password\npassword" | passwd jenkins
3939

4040
EXPOSE 22
41-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
41+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4242
RUN echo "PATH=${PATH}" >> /etc/environment
4343
ENTRYPOINT []
4444
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa512/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1414
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1515
&& apt-get update -y -qq \
1616
&& apt-get install -y -qq \
17-
openjdk-11-jdk \
17+
openjdk-17-jdk \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -38,7 +38,7 @@ RUN echo "password\npassword" | passwd root \
3838
&& echo "password\npassword" | passwd jenkins
3939

4040
EXPOSE 22
41-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
41+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4242
RUN echo "PATH=${PATH}" >> /etc/environment
4343
ENTRYPOINT []
4444
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-14.04/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1313
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1414
&& apt-get update -y -qq \
1515
&& apt-get install -y -qq \
16-
openjdk-11-jdk \
16+
openjdk-17-jdk \
1717
&& rm -rf /var/lib/apt/lists/*
1818

1919
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -36,7 +36,7 @@ RUN echo "password\npassword" | passwd root \
3636
&& echo "password\npassword" | passwd jenkins
3737

3838
EXPOSE 22
39-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
39+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4040
RUN echo "PATH=${PATH}" >> /etc/environment
4141
ENTRYPOINT []
4242
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-16.04/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1313
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1414
&& apt-get update -y -qq \
1515
&& apt-get install -y -qq \
16-
openjdk-11-jdk \
16+
openjdk-17-jdk \
1717
&& rm -rf /var/lib/apt/lists/*
1818

1919
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -36,7 +36,7 @@ RUN echo "password\npassword" | passwd root \
3636
&& echo "password\npassword" | passwd jenkins
3737

3838
EXPOSE 22
39-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
39+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4040
RUN echo "PATH=${PATH}" >> /etc/environment
4141
ENTRYPOINT []
4242
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-18.04/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1313
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1414
&& apt-get update -y -qq \
1515
&& apt-get install -y -qq \
16-
openjdk-11-jdk \
16+
openjdk-17-jdk \
1717
&& rm -rf /var/lib/apt/lists/*
1818

1919
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -36,7 +36,7 @@ RUN echo "password\npassword" | passwd root \
3636
&& echo "password\npassword" | passwd jenkins
3737

3838
EXPOSE 22
39-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
39+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4040
RUN echo "PATH=${PATH}" >> /etc/environment
4141
ENTRYPOINT []
4242
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

‎src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-20.04/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
1414
RUN add-apt-repository ppa:openjdk-r/ppa -y \
1515
&& apt-get update -y -qq \
1616
&& apt-get install -y -qq \
17-
openjdk-11-jdk \
17+
openjdk-17-jdk \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
RUN useradd --password password --shell /bin/bash --uid 1000 jenkins \
@@ -38,7 +38,7 @@ RUN echo "password\npassword" | passwd root \
3838
&& echo "password\npassword" | passwd jenkins
3939

4040
EXPOSE 22
41-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk-amd64/jre/bin:/usr/lib/jvm/java-11-openjdk-amd64/bin
41+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-17-openjdk-amd64/jre/bin:/usr/lib/jvm/java-17-openjdk-amd64/bin
4242
RUN echo "PATH=${PATH}" >> /etc/environment
4343
ENTRYPOINT []
4444
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]

0 commit comments

Comments
 (0)