Skip to content

Commit 3cf8e81

Browse files
committed
Merge branch '1.4.x' into 1.5.x
2 parents f11edd1 + a69a851 commit 3cf8e81

File tree

3 files changed

+9
-24
lines changed
  • spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS

3 files changed

+9
-24
lines changed

spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11-f5ac6bb5/Dockerfile

Lines changed: 0 additions & 12 deletions
This file was deleted.

spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.8-699d6ab3/Dockerfile

Lines changed: 0 additions & 12 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# CentOS 6.9 from 02/06/2017
2+
FROM centos@sha256:a23bced61701af9a0a758e94229676d9f09996a3ff0f3d26955b06bac8c282e0
3+
RUN yum install -y wget && \
4+
yum install -y system-config-services && \
5+
yum install -y curl && \
6+
wget --output-document jdk.rpm \
7+
http://cdn.azul.com/zulu/bin/zulu8.21.0.1-jdk8.0.131-linux.x86_64.rpm && \
8+
yum --nogpg localinstall -y jdk.rpm && \
9+
rm -f jdk.rpm

0 commit comments

Comments
 (0)