Skip to content

Commit 0afc0c2

Browse files
authored
Update files related to docker to point to vault (java-native-access#114)
Motivation: Centos6 is now in the vault as it is EOL. That said we still want to compile on it our releases Modifications: Update files to update repos to point to the vault Result: Be able to still use docker
1 parent 8378c7c commit 0afc0c2

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

docker/Dockerfile.centos renamed to docker/Dockerfile.centos6

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
ARG centos_version=6
2-
FROM centos:$centos_version
3-
# needed to do again after FROM due to docker limitation
4-
ARG centos_version
1+
FROM centos:6.10
52

63
ENV SOURCE_DIR /root/source
74
ENV CMAKE_VERSION_BASE 3.8
85
ENV CMAKE_VERSION $CMAKE_VERSION_BASE.2
96
ENV NINJA_VERSION 1.7.2
107
ENV GO_VERSION 1.9.3
118

9+
# Update as we need to use the vault now.
10+
RUN sed -i -e 's/^mirrorlist/#mirrorlist/g' -e 's/^#baseurl=http:\/\/mirror.centos.org\/centos\/$releasever\//baseurl=http:\/\/vault.centos.org\/6.10\//g' /etc/yum.repos.d/CentOS-Base.repo
11+
1212
# We want to have git 2.x for the maven scm plugin
1313
RUN yum install -y http://opensource.wandisco.com/centos/6/git/x86_64/wandisco-git-release-6-1.noarch.rpm
1414

docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ cd /path/to/source/
77
## centos 6 with java 8
88

99
```
10-
docker-compose -f docker/docker-compose.centos.yaml -f docker/docker-compose.centos-6.18.yaml run build
10+
docker-compose -f docker/docker-compose.centos-6.yaml -f docker/docker-compose.centos-6.18.yaml run build
1111
```

docker/docker-compose.centos-6.18.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ services:
66
image: netty-codec-quic-centos:centos-6-1.8
77
build:
88
args:
9-
centos_version : "6"
109
java_version : "[email protected]"
1110

1211
build:

docker/docker-compose.centos.yaml renamed to docker/docker-compose.centos-6.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
image: netty-codec-quic-centos:default
77
build:
88
context: .
9-
dockerfile: Dockerfile.centos
9+
dockerfile: Dockerfile.centos6
1010

1111
common: &common
1212
image: netty-codec-quic-centos:default

0 commit comments

Comments
 (0)