diff --git a/.github/workflows/check_dockerstatic.yml b/.github/workflows/check_dockerstatic.yml index 876764b21e..ed22c339c6 100644 --- a/.github/workflows/check_dockerstatic.yml +++ b/.github/workflows/check_dockerstatic.yml @@ -26,14 +26,8 @@ jobs: max-parallel: 4 matrix: include: - - os: alpine13.1 - dockerfile: "Dockerfile.alp311" - - os: alpine13.2 - dockerfile: "Dockerfile.alp312" - - os: alpine13.3 - dockerfile: "Dockerfile.alp313" - - os: alpine13.4 - dockerfile: "Dockerfile.alp314" + - os: alpine3.19 + dockerfile: "Dockerfile.alp319" steps: - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0 - name: Test Dockerfile on ${{ matrix.os }} @@ -66,12 +60,8 @@ jobs: max-parallel: 4 matrix: include: - - os: fedora33 - dockerfile: "Dockerfile.f33" - - os: fedora34 - dockerfile: "Dockerfile.f34" - - os: fedora35 - dockerfile: "Dockerfile.f35" + - os: fedora39 + dockerfile: "Dockerfile.f39" steps: - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0 - name: Test Dockerfile on ${{ matrix.os }} diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.alp312 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.alp312 deleted file mode 100644 index b8db4d8383..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.alp312 +++ /dev/null @@ -1,46 +0,0 @@ -FROM alpine:3.12 - -RUN apk --update add bash shadow openssh-server openssh-client unzip zip wget git curl make gcc perl xvfb \ - libxrender libxi libxtst procps musl-dev perl-doc alsa-lib libx11 msttcorefonts-installer fontconfig libxext freetype zlib fakeroot gnupg - -# Add SSL Test packages -RUN apk --update add openssl gnutls gnutls-dev gnutls-utils nss nss-dev nss-tools - -RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -P "" - -## Ensure Fonts Are Updated (Issue https://github.com/adoptium/infrastructure/issues/3039) -RUN update-ms-fonts - -# Get latest jdk17 ga -RUN wget -q 'https://api.adoptium.net/v3/binary/latest/17/ga/alpine-linux/x64/jdk/hotspot/normal/eclipse?project=jdk' -O /tmp/jdk17.tar.gz -RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B -# Get sig file for latest jdk17 ga -RUN wget -q `curl -s 'https://api.adoptium.net/v3/assets/feature_releases/17/ga?architecture=x64&heap_size=normal&image_type=jdk&jvm_impl=hotspot&os=alpine-linux&page=0&page_size=1&project=jdk&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}'` -O /tmp/jdk17.sig -RUN gpg --verify /tmp/jdk17.sig /tmp/jdk17.tar.gz -RUN mkdir -p /usr/lib/jvm/jdk17 && tar -xpzf /tmp/jdk17.tar.gz -C /usr/lib/jvm/jdk17 --strip-components=1 - -# Install ant and ant-contrib. -RUN wget -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.9-bin.zip' -RUN wget -O /tmp/ant-contrib.tgz https://sourceforge.net/projects/ant-contrib/files/ant-contrib/ant-contrib-1.0b2/ant-contrib-1.0b2-bin.tar.gz -RUN echo "d085f59349edf22a93d835aa30aea2521ed39bdb99d57d941f1ebd8d115a561bb28aecc781915ff2a0d9f7caf7bae536cdda0910bb432b2a4bce8b7b90c2903b /tmp/ant.zip" > /tmp/ant.sha512 -RUN echo "0fd2771dca2b8b014a4cb3246715b32e20ad5d26754186d82eee781507a183d5e63064890b95eb27c091c93c1209528a0b18a6d7e6901899319492a7610e74ad /tmp/ant-contrib.tgz" >> /tmp/ant.sha512 -RUN sha512sum -c /tmp/ant.sha512 -RUN unzip -q -d /usr/local /tmp/ant.zip -RUN tar xpfz /tmp/ant-contrib.tgz -C /usr/local/apache-ant-1.10.9/lib --strip-components=2 ant-contrib/lib/ant-contrib.jar -RUN ln -s /usr/local/apache-ant-1.10.9/bin/ant /usr/bin/ant - -# Create user jenkins with random password. Prevents locked user account that makes SSH'ing into -# the container impossible. -RUN groupadd -g 10001 jenkins -RUN useradd -p $(tr -dc A-Za-z0-9 /home/jenkins/.ssh/authorized_keys -RUN chown -R jenkins:jenkins /home/jenkins/.ssh -RUN chmod -R "g=,o=" /home/jenkins/.ssh - -# Remove temporary files. -RUN rm -rf /tmp/jdk17.tar.gz /tmp/ant* /tmp/ant-contrib* /tmp/jdk17.sig - -# Start container with docker run -p 2222:22 UUID. -CMD ["/usr/sbin/sshd","-D"] -EXPOSE 22 diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.alp313 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.alp313 deleted file mode 100644 index ad9bff72e8..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.alp313 +++ /dev/null @@ -1,46 +0,0 @@ -FROM alpine:3.13 - -RUN apk --update add bash shadow openssh-server openssh-client unzip zip wget git curl make gcc perl xvfb \ - libxrender libxi libxtst procps musl-dev perl-doc alsa-lib libx11 msttcorefonts-installer fontconfig libxext freetype zlib fakeroot gnupg - -# Add SSL Test packages -RUN apk --update add openssl gnutls gnutls-dev gnutls-utils nss nss-dev nss-tools - -RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -P "" - -## Ensure Fonts Are Updated (Issue https://github.com/adoptium/infrastructure/issues/3039) -RUN update-ms-fonts - -# Get latest jdk17 ga -RUN wget -q 'https://api.adoptium.net/v3/binary/latest/17/ga/alpine-linux/x64/jdk/hotspot/normal/eclipse?project=jdk' -O /tmp/jdk17.tar.gz -RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B -# Get sig file for latest jdk17 ga -RUN wget -q `curl -s 'https://api.adoptium.net/v3/assets/feature_releases/17/ga?architecture=x64&heap_size=normal&image_type=jdk&jvm_impl=hotspot&os=alpine-linux&page=0&page_size=1&project=jdk&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}'` -O /tmp/jdk17.sig -RUN gpg --verify /tmp/jdk17.sig /tmp/jdk17.tar.gz -RUN mkdir -p /usr/lib/jvm/jdk17 && tar -xpzf /tmp/jdk17.tar.gz -C /usr/lib/jvm/jdk17 --strip-components=1 - -# Install ant and ant-contrib. -RUN wget -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.9-bin.zip' -RUN wget -O /tmp/ant-contrib.tgz https://sourceforge.net/projects/ant-contrib/files/ant-contrib/ant-contrib-1.0b2/ant-contrib-1.0b2-bin.tar.gz -RUN echo "d085f59349edf22a93d835aa30aea2521ed39bdb99d57d941f1ebd8d115a561bb28aecc781915ff2a0d9f7caf7bae536cdda0910bb432b2a4bce8b7b90c2903b /tmp/ant.zip" > /tmp/ant.sha512 -RUN echo "0fd2771dca2b8b014a4cb3246715b32e20ad5d26754186d82eee781507a183d5e63064890b95eb27c091c93c1209528a0b18a6d7e6901899319492a7610e74ad /tmp/ant-contrib.tgz" >> /tmp/ant.sha512 -RUN sha512sum -c /tmp/ant.sha512 -RUN unzip -q -d /usr/local /tmp/ant.zip -RUN tar xpfz /tmp/ant-contrib.tgz -C /usr/local/apache-ant-1.10.9/lib --strip-components=2 ant-contrib/lib/ant-contrib.jar -RUN ln -s /usr/local/apache-ant-1.10.9/bin/ant /usr/bin/ant - -# Create user jenkins with random password. Prevents locked user account that makes SSH'ing into -# the container impossible. -RUN groupadd -g 10001 jenkins -RUN useradd -p $(tr -dc A-Za-z0-9 /home/jenkins/.ssh/authorized_keys -RUN chown -R jenkins:jenkins /home/jenkins/.ssh -RUN chmod -R "g=,o=" /home/jenkins/.ssh - -# Remove temporary files. -RUN rm -rf /tmp/jdk17.tar.gz /tmp/ant* /tmp/ant-contrib* /tmp/jdk17.sig - -# Start container with docker run -p 2222:22 UUID. -CMD ["/usr/sbin/sshd","-D"] -EXPOSE 22 diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.alp314 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.alp314 deleted file mode 100644 index fe48fc42c8..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.alp314 +++ /dev/null @@ -1,47 +0,0 @@ -FROM alpine:3.14 - -RUN apk --update add bash shadow openssh-server openssh-client unzip zip wget git curl make gcc perl xvfb \ - libxrender libxi libxtst procps musl-dev perl-doc alsa-lib libx11 msttcorefonts-installer fontconfig libxext freetype zlib fakeroot gnupg - -# Add SSL Test packages -RUN apk --update add openssl gnutls gnutls-dev gnutls-utils nss nss-dev nss-tools - -RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -P "" - -## Ensure Fonts Are Updated (Issue https://github.com/adoptium/infrastructure/issues/3039) -RUN update-ms-fonts - -# Get latest jdk17 ga -RUN wget -q 'https://api.adoptium.net/v3/binary/latest/17/ga/alpine-linux/x64/jdk/hotspot/normal/eclipse?project=jdk' -O /tmp/jdk17.tar.gz -RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B -# Get sig file for latest jdk17 ga -RUN wget -q `curl -s 'https://api.adoptium.net/v3/assets/feature_releases/17/ga?architecture=x64&heap_size=normal&image_type=jdk&jvm_impl=hotspot&os=alpine-linux&page=0&page_size=1&project=jdk&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}'` -O /tmp/jdk17.sig -RUN gpg --verify /tmp/jdk17.sig /tmp/jdk17.tar.gz - -RUN mkdir -p /usr/lib/jvm/jdk17 && tar -xpzf /tmp/jdk17.tar.gz -C /usr/lib/jvm/jdk17 --strip-components=1 - -# Install ant and ant-contrib. -RUN wget -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.9-bin.zip' -RUN wget -O /tmp/ant-contrib.tgz https://sourceforge.net/projects/ant-contrib/files/ant-contrib/ant-contrib-1.0b2/ant-contrib-1.0b2-bin.tar.gz -RUN echo "d085f59349edf22a93d835aa30aea2521ed39bdb99d57d941f1ebd8d115a561bb28aecc781915ff2a0d9f7caf7bae536cdda0910bb432b2a4bce8b7b90c2903b /tmp/ant.zip" > /tmp/ant.sha512 -RUN echo "0fd2771dca2b8b014a4cb3246715b32e20ad5d26754186d82eee781507a183d5e63064890b95eb27c091c93c1209528a0b18a6d7e6901899319492a7610e74ad /tmp/ant-contrib.tgz" >> /tmp/ant.sha512 -RUN sha512sum -c /tmp/ant.sha512 -RUN unzip -q -d /usr/local /tmp/ant.zip -RUN tar xpfz /tmp/ant-contrib.tgz -C /usr/local/apache-ant-1.10.9/lib --strip-components=2 ant-contrib/lib/ant-contrib.jar -RUN ln -s /usr/local/apache-ant-1.10.9/bin/ant /usr/bin/ant - -# Create user jenkins with random password. Prevents locked user account that makes SSH'ing into -# the container impossible. -RUN groupadd -g 10001 jenkins -RUN useradd -p $(tr -dc A-Za-z0-9 /home/jenkins/.ssh/authorized_keys -RUN chown -R jenkins:jenkins /home/jenkins/.ssh -RUN chmod -R "g=,o=" /home/jenkins/.ssh - -# Remove temporary files. -RUN rm -rf /tmp/jdk17.tar.gz /tmp/ant* /tmp/ant-contrib* /tmp/jdk17.sig - -# Start container with docker run -p 2222:22 UUID. -CMD ["/usr/sbin/sshd","-D"] -EXPOSE 22 diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.f33 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.f33 deleted file mode 100644 index 056639ebf2..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.f33 +++ /dev/null @@ -1,36 +0,0 @@ -FROM fedora:33 - -RUN yum -y update && yum install -y perl openssh-server unzip zip wget -RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -P "" -# Get latest jdk17 ga -RUN wget -q 'https://api.adoptium.net/v3/binary/latest/17/ga/linux/x64/jdk/hotspot/normal/eclipse?project=jdk' -O /tmp/jdk17.tar.gz -RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B -# Get sig file for latest jdk17 ga -RUN wget -q `curl -s 'https://api.adoptium.net/v3/assets/feature_releases/17/ga?architecture=x64&heap_size=normal&image_type=jdk&jvm_impl=hotspot&os=linux&page=0&page_size=1&project=jdk&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}'` -O /tmp/jdk17.sig -RUN gpg --verify /tmp/jdk17.sig /tmp/jdk17.tar.gz -RUN mkdir -p /usr/lib/jvm/jdk17 && tar -xpzf /tmp/jdk17.tar.gz -C /usr/lib/jvm/jdk17 --strip-components=1 -# Install ant -RUN wget -q -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip' -RUN wget -q -O /tmp/ant-contrib.tgz https://sourceforge.net/projects/ant-contrib/files/ant-contrib/ant-contrib-1.0b2/ant-contrib-1.0b2-bin.tar.gz -RUN echo "2e48f9e429d67708f5690bc307232f08440d01ebe414059292b6543971da9c7cd259c21533b9163b4dd753321c17bd917adf8407d03245a0945fc30a4e633163 /tmp/ant.zip" > /tmp/ant.sha512 -RUN echo "0fd2771dca2b8b014a4cb3246715b32e20ad5d26754186d82eee781507a183d5e63064890b95eb27c091c93c1209528a0b18a6d7e6901899319492a7610e74ad /tmp/ant-contrib.tgz" >> /tmp/ant.sha512 -RUN sha512sum --check --strict /tmp/ant.sha512 -RUN ln -s /usr/local/apache-ant-1.10.5/bin/ant /usr/bin/ant -RUN unzip -q -d /usr/local /tmp/ant.zip -RUN tar xpfz /tmp/ant-contrib.tgz -C /usr/local/apache-ant-1.10.5/lib --strip-components=2 ant-contrib/lib/ant-contrib.jar -# Clear up space -RUN rm /tmp/jdk17.tar.gz /tmp/ant.zip /tmp/ant-contrib.tgz /tmp/jdk17.sig -# Set up jenkins user -RUN useradd -m -d /home/jenkins jenkins -RUN mkdir /home/jenkins/.ssh -RUN echo "Jenkins_User_SSHKey" > /home/jenkins/.ssh/authorized_keys -RUN chown -R jenkins /home/jenkins/.ssh -RUN chmod -R og-rwx /home/jenkins/.ssh -# RUN service ssh start -CMD ["/usr/sbin/sshd","-D"] -RUN yum install -y git curl make gcc xorg-x11-server-Xvfb libXrender libXi libXtst procps glibc-langpack-en fontconfig which hostname fakeroot shared-mime-info -# Install Packages For openssl -RUN yum -y update && yum install -y openssl gnutls gnutls-utils libnss3.so nss-devel nss-tools -# ENTRYPOINT /usr/lib/jvm/jdk17/bin/java -EXPOSE 22 -# Start with docker run -p 2222:22 UUID diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.f34 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.f34 deleted file mode 100644 index 93b2884287..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.f34 +++ /dev/null @@ -1,36 +0,0 @@ -FROM fedora:34 - -RUN yum -y update && yum install -y perl openssh-server unzip zip wget -RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -P "" -# Get latest jdk17 ga -RUN wget -q 'https://api.adoptium.net/v3/binary/latest/17/ga/linux/x64/jdk/hotspot/normal/eclipse?project=jdk' -O /tmp/jdk17.tar.gz -RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B -# Get sig file for latest jdk17 ga -RUN wget -q `curl -s 'https://api.adoptium.net/v3/assets/feature_releases/17/ga?architecture=x64&heap_size=normal&image_type=jdk&jvm_impl=hotspot&os=linux&page=0&page_size=1&project=jdk&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}'` -O /tmp/jdk17.sig -RUN gpg --verify /tmp/jdk17.sig /tmp/jdk17.tar.gz -RUN mkdir -p /usr/lib/jvm/jdk17 && tar -xpzf /tmp/jdk17.tar.gz -C /usr/lib/jvm/jdk17 --strip-components=1 -# Install ant 1.10.12 -RUN wget -q -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.12-bin.zip' -RUN wget -q -O /tmp/ant-contrib.tgz https://sourceforge.net/projects/ant-contrib/files/ant-contrib/ant-contrib-1.0b2/ant-contrib-1.0b2-bin.tar.gz -RUN echo "7e6fbcc3563df4bd87c883ad86a161a71da2774e0ed71a1b3aad82cbff1a7656ed9a0acb5ce40652129376dfd79f1ef74ec3369c1067d412a63062fea62ceccd /tmp/ant.zip" > /tmp/ant.sha512 -RUN echo "0fd2771dca2b8b014a4cb3246715b32e20ad5d26754186d82eee781507a183d5e63064890b95eb27c091c93c1209528a0b18a6d7e6901899319492a7610e74ad /tmp/ant-contrib.tgz" >> /tmp/ant.sha512 -RUN sha512sum --check --strict /tmp/ant.sha512 -RUN ln -s /usr/local/apache-ant-1.10.12/bin/ant /usr/bin/ant -RUN unzip -q -d /usr/local /tmp/ant.zip -RUN tar xpfz /tmp/ant-contrib.tgz -C /usr/local/apache-ant-1.10.12/lib --strip-components=2 ant-contrib/lib/ant-contrib.jar -# Clear up space -RUN rm /tmp/jdk17.tar.gz /tmp/ant.zip /tmp/ant-contrib.tgz /tmp/jdk17.sig -# Set up jenkins user -RUN useradd -m -d /home/jenkins jenkins -RUN mkdir /home/jenkins/.ssh -RUN echo "Jenkins_User_SSHKey" > /home/jenkins/.ssh/authorized_keys -RUN chown -R jenkins /home/jenkins/.ssh -RUN chmod -R og-rwx /home/jenkins/.ssh -# RUN service ssh start -CMD ["/usr/sbin/sshd","-D"] -RUN yum install -y git curl make gcc xorg-x11-server-Xvfb libXrender libXi libXtst procps glibc-langpack-en fontconfig which hostname fakeroot shared-mime-info -# Install Packages For openssl -RUN yum -y update && yum install -y openssl gnutls gnutls-utils libnss3.so nss-devel nss-tools -# ENTRYPOINT /usr/lib/jvm/jdk17/bin/java -EXPOSE 22 -# Start with docker run -p 2222:22 UUID