diff --git a/docker/README.md b/docker/README.md index 9970aaed5d..d96242b321 100644 --- a/docker/README.md +++ b/docker/README.md @@ -10,10 +10,10 @@ cd /path/to/netty/ docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.centos-6.18.yaml run test ``` -## centos 7 with java 9 +## centos 7 with java 11 ``` -docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.centos-7.19.yaml run test +docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.centos-7.111.yaml run test ``` etc, etc diff --git a/docker/docker-compose.centos-6.110.yaml b/docker/docker-compose.centos-6.110.yaml index 144780de9e..7a60f46e32 100644 --- a/docker/docker-compose.centos-6.110.yaml +++ b/docker/docker-compose.centos-6.110.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "6" - java_version : "openjdk@1.10.0-2" + java_version : "zulu@1.10.0-2" test: image: netty:centos-6-1.10 diff --git a/docker/docker-compose.centos-6.112.yaml b/docker/docker-compose.centos-6.112.yaml index e69babcafa..aee3e1fe2c 100644 --- a/docker/docker-compose.centos-6.112.yaml +++ b/docker/docker-compose.centos-6.112.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "6" - java_version : "adopt@1.12.0-1" + java_version : "adopt@1.12.0-2" test: image: netty:centos-6-1.12 diff --git a/docker/docker-compose.centos-6.graalvm1.yaml b/docker/docker-compose.centos-6.graalvm1.yaml index 4d2fce97d6..f00fb2bfdc 100644 --- a/docker/docker-compose.centos-6.graalvm1.yaml +++ b/docker/docker-compose.centos-6.graalvm1.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "6" - java_version : "graalvm@19.0.0" + java_version : "graalvm@19.1.1" test: image: netty:centos-6-1.8 diff --git a/docker/docker-compose.centos-7.110.yaml b/docker/docker-compose.centos-7.110.yaml index 7f165208e1..280ed73b96 100644 --- a/docker/docker-compose.centos-7.110.yaml +++ b/docker/docker-compose.centos-7.110.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "7" - java_version : "openjdk@1.10.0-2" + java_version : "zulu@1.10.0-2" test: image: netty:centos-7-1.10 diff --git a/docker/docker-compose.centos-7.112.yaml b/docker/docker-compose.centos-7.112.yaml index 72d2b28f48..d628188bba 100644 --- a/docker/docker-compose.centos-7.112.yaml +++ b/docker/docker-compose.centos-7.112.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "7" - java_version : "adopt@1.12.0-1" + java_version : "adopt@1.12.0-2" test: image: netty:centos-7-1.12 diff --git a/docker/docker-compose.centos-7.19.yaml b/docker/docker-compose.centos-7.19.yaml index 4df1e5932e..d1b6acf634 100644 --- a/docker/docker-compose.centos-7.19.yaml +++ b/docker/docker-compose.centos-7.19.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "7" - java_version : "openjdk@1.9.0-7" + java_version : "zulu@1.9.0-7" test: image: netty:centos-7-1.9 diff --git a/docker/docker-sync-compose.centos-6.18.yaml b/docker/docker-sync-compose.centos-6.18.yaml deleted file mode 100644 index 34e0e58e67..0000000000 --- a/docker/docker-sync-compose.centos-6.18.yaml +++ /dev/null @@ -1,34 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: netty:centos-6-1.8 - build: - args: - centos_version : "6" - java_version : "adopt@1.8.222-10" - - test: - image: netty:centos-6-1.8 - volumes: - - code-sync:/code:nocopy - - test-leak: - image: netty:centos-6-1.8 - volumes: - - code-sync:/code:nocopy - - test-boringssl-static: - image: netty:centos-6-1.8 - volumes: - - code-sync:/code:nocopy - - shell: - image: netty:centos-6-1.8 - volumes: - - code-sync:/code:nocopy - -volumes: - code-sync: - external: true diff --git a/docker/docker-sync.centos-6.18.yaml b/docker/docker-sync.centos-6.18.yaml deleted file mode 100644 index 98a3c121ef..0000000000 --- a/docker/docker-sync.centos-6.18.yaml +++ /dev/null @@ -1,8 +0,0 @@ -version: "2" - -compose-dev-file-path: 'docker-sync-compose.centos-6.18.yaml' - -syncs: - #IMPORTANT: ensure this name is unique and does not match your other application container name - code-sync: #tip: add -sync and you keep consistent names as a convention - src: '../'