Skip to content

Commit 90be62b

Browse files
Update Docker images used for launch script tests
Closes gh-24349
1 parent 45f685f commit 90be62b

File tree

5 files changed

+3
-16
lines changed

5 files changed

+3
-16
lines changed

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/JarLaunchScriptIntegrationTests.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818

1919
import java.util.List;
2020

21-
import org.junit.jupiter.api.condition.OS;
2221
import org.junit.jupiter.params.ParameterizedTest;
2322
import org.junit.jupiter.params.provider.MethodSource;
2423

25-
import org.springframework.boot.testsupport.junit.DisabledOnOs;
2624
import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
2725

2826
import static org.assertj.core.api.Assertions.assertThat;
@@ -34,8 +32,6 @@
3432
* @author Andy Wilkinson
3533
*/
3634
@DisabledIfDockerUnavailable
37-
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
38-
disabledReason = "The docker images have no ARM support")
3935
class JarLaunchScriptIntegrationTests extends AbstractLaunchScriptIntegrationTests {
4036

4137
JarLaunchScriptIntegrationTests() {
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# CentOS 7.9 from 18/11/2020
2-
FROM centos@sha256:e4ca2ed0202e76be184e75fb26d14bf974193579039d5573fb2348664deef76e
1+
FROM centos:7.9.2009
32
RUN mkdir -p /opt/openjdk && \
43
cd /opt/openjdk && \
54
curl -L https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u202-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz | tar zx --strip-components=1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:trusty-20160914
1+
FROM ubuntu:jammy-20230624
22
RUN apt-get update && \
33
apt-get install -y software-properties-common curl && \
44
mkdir -p /opt/openjdk && \

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/xenial-20160914/Dockerfile

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

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:focal-20211006
1+
FROM ubuntu:jammy-20230624
22
RUN apt-get update && \
33
apt-get install -y software-properties-common curl && \
44
mkdir -p /opt/oraclejdk && \

0 commit comments

Comments
 (0)