andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup docker / docker-compose configs (#9473)

Browse Source 
Motivation:

We should use the same java versions whenever we use CentOS 6 or 7 and also use the latest Java12 version

Modifications:

- Use same Java versions
- Use latest Java 12 version
- Remove old configs which are not used anymore

Result:

Docker cleanup
This commit is contained in:
Norman Maurer 2019-08-16 13:59:36 +02:00
parent fc33d6ae99
commit ad7c554f5a
9 changed files with 8 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/README.md
View File

@ -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

2
docker/docker-compose.centos-6.110.yaml
View File

@ -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

2
docker/docker-compose.centos-6.112.yaml
View File

@ -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

2
docker/docker-compose.centos-6.graalvm1.yaml
View File

@ -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

2
docker/docker-compose.centos-7.110.yaml
View File

@ -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

2
docker/docker-compose.centos-7.112.yaml
View File

@ -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

2
docker/docker-compose.centos-7.19.yaml
View File

@ -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

34
docker/docker-sync-compose.centos-6.18.yaml
View File

@ -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

8
docker/docker-sync.centos-6.18.yaml
View File

@ -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: '../'