diff --git a/Jenkinsfile b/Jenkinsfile index 00e6786d7..cc0ffa98a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -55,7 +55,7 @@ pipeline { steps { script { - def image = docker.build("springci/spring-data-openjdk17-8-cassandra-3.11", "ci/openjdk16-8-cassandra-3.11/") + def image = docker.build("springci/spring-data-openjdk17-8-cassandra-3.11", "ci/openjdk17-8-cassandra-3.11/") docker.withRegistry('', 'hub.docker.com-springbuildmaster') { image.push() } diff --git a/ci/openjdk11-8-cassandra-3.11/Dockerfile b/ci/openjdk11-8-cassandra-3.11/Dockerfile index a1852e428..64354f436 100644 --- a/ci/openjdk11-8-cassandra-3.11/Dockerfile +++ b/ci/openjdk11-8-cassandra-3.11/Dockerfile @@ -1,7 +1,8 @@ FROM adoptopenjdk/openjdk11:latest RUN set -eux; \ - CASSANDRA_URL='https://www-us.apache.org/dist/cassandra/3.11.10/apache-cassandra-3.11.10-bin.tar.gz'; \ + CASSANDRA_URL='https://archive.apache.org/dist/cassandra/3.11.10/apache-cassandra-3.11.10-bin.tar.gz'; \ + sed -i -e 's/http/https/g' /etc/apt/sources.list ; \ curl -LfsSo /tmp/cassandra.tar.gz ${CASSANDRA_URL}; \ mkdir -p /opt/cassandra /opt/cassandra/data /opt/cassandra/logs; \ cd /opt/cassandra; \ @@ -11,7 +12,7 @@ RUN set -eux; \ useradd -d /home/jenkins-docker -m -u 1001 -U jenkins-docker; RUN set -eux; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u275b01.tar.gz'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \ mkdir -p /opt/java/openjdk8; \ cd /opt/java/openjdk8; \ diff --git a/ci/openjdk17-8-cassandra-3.11/Dockerfile b/ci/openjdk17-8-cassandra-3.11/Dockerfile index fc3369247..0a09eebe8 100644 --- a/ci/openjdk17-8-cassandra-3.11/Dockerfile +++ b/ci/openjdk17-8-cassandra-3.11/Dockerfile @@ -11,6 +11,7 @@ RUN set -eux; \ chmod -R a+rwx /opt/cassandra; \ useradd -d /home/jenkins-docker -m -u 1001 -U jenkins-docker; + RUN set -eux; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \ diff --git a/ci/openjdk8-cassandra-3.11/Dockerfile b/ci/openjdk8-cassandra-3.11/Dockerfile index 123722696..6519226c7 100644 --- a/ci/openjdk8-cassandra-3.11/Dockerfile +++ b/ci/openjdk8-cassandra-3.11/Dockerfile @@ -1,7 +1,8 @@ FROM adoptopenjdk/openjdk8:latest RUN set -eux; \ - CASSANDRA_URL='https://www-us.apache.org/dist/cassandra/3.11.10/apache-cassandra-3.11.10-bin.tar.gz'; \ + CASSANDRA_URL='https://archive.apache.org/dist/cassandra/3.11.10/apache-cassandra-3.11.10-bin.tar.gz'; \ + sed -i -e 's/http/https/g' /etc/apt/sources.list ; \ curl -LfsSo /tmp/cassandra.tar.gz ${CASSANDRA_URL}; \ mkdir -p /opt/cassandra /opt/cassandra/data /opt/cassandra/logs; \ cd /opt/cassandra; \