Skip to content

Commit

Permalink
Cleanup docker / docker-compose configs (netty#9473)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
normanmaurer authored Aug 16, 2019
1 parent bcad76e commit 10eb2cd
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 50 deletions.
4 changes: 2 additions & 2 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion docker/docker-compose.centos-6.110.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.centos-6.112.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
build:
args:
centos_version : "6"
java_version : "[email protected]1"
java_version : "[email protected]2"

test:
image: netty:centos-6-1.12
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.centos-6.graalvm1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.centos-7.110.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.centos-7.112.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
build:
args:
centos_version : "7"
java_version : "[email protected]1"
java_version : "[email protected]2"

test:
image: netty:centos-7-1.12
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.centos-7.19.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
34 changes: 0 additions & 34 deletions docker/docker-sync-compose.centos-6.18.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions docker/docker-sync.centos-6.18.yaml

This file was deleted.

0 comments on commit 10eb2cd

Please sign in to comment.