Skip to content

Commit 05cb997

Browse files
committed
Polishing.
Use HTTPS URL's for apt download. See spring-projects#1171
1 parent cb80b7d commit 05cb997

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pipeline {
5555

5656
steps {
5757
script {
58-
def image = docker.build("springci/spring-data-openjdk17-8-cassandra-3.11", "ci/openjdk16-8-cassandra-3.11/")
58+
def image = docker.build("springci/spring-data-openjdk17-8-cassandra-3.11", "ci/openjdk17-8-cassandra-3.11/")
5959
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
6060
image.push()
6161
}

ci/openjdk11-8-cassandra-3.11/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM adoptopenjdk/openjdk11:latest
22

33
RUN set -eux; \
4-
CASSANDRA_URL='https://www-us.apache.org/dist/cassandra/3.11.10/apache-cassandra-3.11.10-bin.tar.gz'; \
4+
CASSANDRA_URL='https://archive.apache.org/dist/cassandra/3.11.10/apache-cassandra-3.11.10-bin.tar.gz'; \
5+
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
56
curl -LfsSo /tmp/cassandra.tar.gz ${CASSANDRA_URL}; \
67
mkdir -p /opt/cassandra /opt/cassandra/data /opt/cassandra/logs; \
78
cd /opt/cassandra; \
@@ -11,7 +12,7 @@ RUN set -eux; \
1112
useradd -d /home/jenkins-docker -m -u 1001 -U jenkins-docker;
1213

1314
RUN set -eux; \
14-
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u275b01.tar.gz'; \
15+
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \
1516
curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
1617
mkdir -p /opt/java/openjdk8; \
1718
cd /opt/java/openjdk8; \

ci/openjdk17-8-cassandra-3.11/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN set -eux; \
1111
chmod -R a+rwx /opt/cassandra; \
1212
useradd -d /home/jenkins-docker -m -u 1001 -U jenkins-docker;
1313

14+
1415
RUN set -eux; \
1516
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \
1617
curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \

ci/openjdk8-cassandra-3.11/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM adoptopenjdk/openjdk8:latest
22

33
RUN set -eux; \
4-
CASSANDRA_URL='https://www-us.apache.org/dist/cassandra/3.11.10/apache-cassandra-3.11.10-bin.tar.gz'; \
4+
CASSANDRA_URL='https://archive.apache.org/dist/cassandra/3.11.10/apache-cassandra-3.11.10-bin.tar.gz'; \
5+
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
56
curl -LfsSo /tmp/cassandra.tar.gz ${CASSANDRA_URL}; \
67
mkdir -p /opt/cassandra /opt/cassandra/data /opt/cassandra/logs; \
78
cd /opt/cassandra; \

0 commit comments

Comments
 (0)