Skip to content

Commit

Permalink
Update files related to docker to point to vault (java-native-access#114
Browse files Browse the repository at this point in the history
)

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
  • Loading branch information
normanmaurer authored Dec 18, 2020
1 parent 8378c7c commit 0afc0c2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
8 changes: 4 additions & 4 deletions docker/Dockerfile.centos → docker/Dockerfile.centos6
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
ARG centos_version=6
FROM centos:$centos_version
# needed to do again after FROM due to docker limitation
ARG centos_version
FROM centos:6.10

ENV SOURCE_DIR /root/source
ENV CMAKE_VERSION_BASE 3.8
ENV CMAKE_VERSION $CMAKE_VERSION_BASE.2
ENV NINJA_VERSION 1.7.2
ENV GO_VERSION 1.9.3

# Update as we need to use the vault now.
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

# We want to have git 2.x for the maven scm plugin
RUN yum install -y http://opensource.wandisco.com/centos/6/git/x86_64/wandisco-git-release-6-1.noarch.rpm

Expand Down
2 changes: 1 addition & 1 deletion docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ cd /path/to/source/
## centos 6 with java 8

```
docker-compose -f docker/docker-compose.centos.yaml -f docker/docker-compose.centos-6.18.yaml run build
docker-compose -f docker/docker-compose.centos-6.yaml -f docker/docker-compose.centos-6.18.yaml run build
```
1 change: 0 additions & 1 deletion docker/docker-compose.centos-6.18.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ services:
image: netty-codec-quic-centos:centos-6-1.8
build:
args:
centos_version : "6"
java_version : "[email protected]"

build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
image: netty-codec-quic-centos:default
build:
context: .
dockerfile: Dockerfile.centos
dockerfile: Dockerfile.centos6

common: &common
image: netty-codec-quic-centos:default
Expand Down

0 comments on commit 0afc0c2

Please sign in to comment.