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

Jump to bottom

Updates Java 11 to Java 17 for test environment #487

Merged
merged 1 commit into from
May 30, 2024
Merged

Updates Java 11 to Java 17 for test environment #487

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
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-curve25519-sha256/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-dsa/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ec/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp256/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp384/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp521/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ed25519/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ec/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ed/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-rsa/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa256/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa512/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-14.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-16.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-18.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]
4 changes: 2 additions & 2 deletions src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-20.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \
RUN add-apt-repository ppa:openjdk-r/ppa -y \
&& apt-get update -y -qq \
&& apt-get install -y -qq \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*

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

EXPOSE 22
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
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
RUN echo "PATH=${PATH}" >> /etc/environment
ENTRYPOINT []
CMD [ "/bin/sh", "-c", "/usr/sbin/sshd -e -D -p 22"]