diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-10-18 17:50:11 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-10-18 18:55:36 +0200 |
| commit | 99114ec00dcbf110b10546f6222d9f469f100d21 (patch) | |
| tree | 826c948ccbe489c4d9057c683fd5ef923e7685d5 /docker | |
| parent | 7ba6bd70595d10b9825090337f6d4a75f2d7c51e (diff) | |
Switch to golang:alpine3.8 as based image
It fixes all issues raised by the Alpine testing go package [1].
It conforms with Kubernetes which requires the latest go version.
[1] https://build.opnfv.org/ci/job/functest-kubernetes-healthcheck-docker-build-amd64-master/45/console
Change-Id: I388c843a21af9763703a40586ecf9b0b4583ebcb
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit e48f491529032b8dd009843976545febaddb0b7b)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index f1d4d34f..50d79c4a 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM golang:alpine3.8 ARG BRANCH=stable/gambia ARG OPENSTACK_TAG=stable/queens diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index c1cb3648..cf6bc7e5 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -5,9 +5,8 @@ ARG K8S_TAG=v1.11.3 RUN apk --no-cache add --update make py-pip bash git \ grep rsync linux-headers musl-dev findutils \ libffi libssl1.0 libjpeg-turbo && \ - apk --no-cache add 'go>1.10.2' --repository http://dl-cdn.alpinelinux.org/alpine/edge/community && \ apk --no-cache add --virtual .build-deps --update \ - python-dev libffi-dev openssl-dev libjpeg-turbo-dev && \ + gcc python-dev libffi-dev openssl-dev libjpeg-turbo-dev && \ git init /src/k8s.io/kubernetes && \ (cd /src/k8s.io/kubernetes && \ git fetch --tags https://github.com/kubernetes/kubernetes $K8S_TAG && \ |