summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-10-18 17:50:11 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-10-18 18:40:20 +0200
commite48f491529032b8dd009843976545febaddb0b7b (patch)
treec9d1e66869d937840f012fcc847eab677dd37f48 /docker
parent083f45c9058f3e6e043d7224d14f5d0b5ff7bb41 (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>
Diffstat (limited to 'docker')
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--docker/healthcheck/Dockerfile3
2 files changed, 2 insertions, 3 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 121fc0aa..2b68d0e1 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.8
+FROM golang:alpine3.8
ARG BRANCH=master
ARG OPENSTACK_TAG=master
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index c3e2c654..371a1258 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -5,9 +5,8 @@ ARG K8S_TAG=master
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 && \