From 6f8823c91de4754a4a72a91c41eb87a524475988 Mon Sep 17 00:00:00 2001 From: Adrien Lecharpentier Date: Thu, 30 May 2024 11:16:52 +0200 Subject: [PATCH] Updates Java 11 to Java 17 for test environment (#487) --- .../sshslaves/agents/ssh-agent-curve25519-sha256/Dockerfile | 4 ++-- .../hudson/plugins/sshslaves/agents/ssh-agent-dsa/Dockerfile | 4 ++-- .../hudson/plugins/sshslaves/agents/ssh-agent-ec/Dockerfile | 4 ++-- .../sshslaves/agents/ssh-agent-ecdh-sha2-nistp256/Dockerfile | 4 ++-- .../sshslaves/agents/ssh-agent-ecdh-sha2-nistp384/Dockerfile | 4 ++-- .../sshslaves/agents/ssh-agent-ecdh-sha2-nistp521/Dockerfile | 4 ++-- .../plugins/sshslaves/agents/ssh-agent-ed25519/Dockerfile | 4 ++-- .../plugins/sshslaves/agents/ssh-agent-host-ec/Dockerfile | 4 ++-- .../plugins/sshslaves/agents/ssh-agent-host-ed/Dockerfile | 4 ++-- .../plugins/sshslaves/agents/ssh-agent-host-rsa/Dockerfile | 4 ++-- .../hudson/plugins/sshslaves/agents/ssh-agent-rsa/Dockerfile | 4 ++-- .../plugins/sshslaves/agents/ssh-agent-rsa256/Dockerfile | 4 ++-- .../plugins/sshslaves/agents/ssh-agent-rsa512/Dockerfile | 4 ++-- .../sshslaves/agents/ssh-agent-ubuntu-14.04/Dockerfile | 4 ++-- .../sshslaves/agents/ssh-agent-ubuntu-16.04/Dockerfile | 4 ++-- .../sshslaves/agents/ssh-agent-ubuntu-18.04/Dockerfile | 4 ++-- .../sshslaves/agents/ssh-agent-ubuntu-20.04/Dockerfile | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-curve25519-sha256/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-curve25519-sha256/Dockerfile index 7812a059..bbfe852f 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-curve25519-sha256/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-curve25519-sha256/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-dsa/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-dsa/Dockerfile index 7812a059..bbfe852f 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-dsa/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-dsa/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ec/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ec/Dockerfile index 7812a059..bbfe852f 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ec/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ec/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp256/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp256/Dockerfile index 7812a059..bbfe852f 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp256/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp256/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp384/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp384/Dockerfile index 7812a059..bbfe852f 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp384/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp384/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp521/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp521/Dockerfile index 7812a059..bbfe852f 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp521/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ecdh-sha2-nistp521/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ed25519/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ed25519/Dockerfile index 7812a059..bbfe852f 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ed25519/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ed25519/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ec/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ec/Dockerfile index df485831..f46b4049 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ec/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ec/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ed/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ed/Dockerfile index 51aff637..555b69ad 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ed/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-ed/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-rsa/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-rsa/Dockerfile index 0d3df278..0ae0cbbd 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-rsa/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-host-rsa/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa/Dockerfile index 7812a059..bbfe852f 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa256/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa256/Dockerfile index 7812a059..bbfe852f 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa256/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa256/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa512/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa512/Dockerfile index 7812a059..bbfe852f 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa512/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-rsa512/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-14.04/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-14.04/Dockerfile index b321a4b9..745e5fd7 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-14.04/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-14.04/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-16.04/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-16.04/Dockerfile index 0af98161..8fdb26e1 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-16.04/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-16.04/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-18.04/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-18.04/Dockerfile index 9260ed51..9739f075 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-18.04/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-18.04/Dockerfile @@ -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 \ @@ -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"] diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-20.04/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-20.04/Dockerfile index 7812a059..bbfe852f 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-20.04/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-ubuntu-20.04/Dockerfile @@ -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 \ @@ -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"]