From b5c58900c84dd3c2e23749532adcfe089458b95d Mon Sep 17 00:00:00 2001 From: Pawel Krupa Date: Mon, 20 Aug 2018 16:31:28 +0200 Subject: [PATCH 1/3] use openshift/origin-base --- cmd/cluster-controller/Dockerfile | 4 ++-- cmd/machine-controller/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/cluster-controller/Dockerfile b/cmd/cluster-controller/Dockerfile index c4918c96de..d6dfbb8118 100644 --- a/cmd/cluster-controller/Dockerfile +++ b/cmd/cluster-controller/Dockerfile @@ -23,7 +23,7 @@ COPY . . RUN CGO_ENABLED=0 GOOS=linux go install -a -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api-provider-aws/cmd/cluster-controller # Final container -FROM debian:stretch-slim -RUN apt-get update && apt-get install -y ca-certificates openssh-server && rm -rf /var/lib/apt/lists/* +FROM openshift/origin-base +RUN yum install -y ca-certificates openssh COPY --from=builder /go/bin/cluster-controller . diff --git a/cmd/machine-controller/Dockerfile b/cmd/machine-controller/Dockerfile index ef6feb789b..7b28540c7e 100644 --- a/cmd/machine-controller/Dockerfile +++ b/cmd/machine-controller/Dockerfile @@ -23,7 +23,7 @@ COPY . . RUN CGO_ENABLED=0 GOOS=linux go install -a -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api-provider-aws/cmd/machine-controller # Final container -FROM debian:stretch-slim -RUN apt-get update && apt-get install -y ca-certificates openssh-server && rm -rf /var/lib/apt/lists/* +FROM openshift/origin-base +RUN yum install -y ca-certificates openssh COPY --from=builder /go/bin/machine-controller . From c0d44888079caf4db9392ef856a89139eb4265fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Krupa?= Date: Fri, 24 Aug 2018 21:04:02 +0200 Subject: [PATCH 2/3] change to openshift/origin-release:golang-1.10 --- cmd/cluster-controller/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/cluster-controller/Dockerfile b/cmd/cluster-controller/Dockerfile index d6dfbb8118..5e65e71459 100644 --- a/cmd/cluster-controller/Dockerfile +++ b/cmd/cluster-controller/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Reproducible builder image -FROM golang:1.10.0 as builder +FROM openshift/origin-release:golang-1.10 as builder WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-aws # This expects that the context passed to the docker build command is # the cluster-api-provider-aws directory. From 73629fb0162598b7d5ad616bc6136a4bc3369db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Krupa?= Date: Fri, 24 Aug 2018 21:04:18 +0200 Subject: [PATCH 3/3] change to openshift/origin-release:golang-1.10 --- cmd/machine-controller/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/machine-controller/Dockerfile b/cmd/machine-controller/Dockerfile index 7b28540c7e..c6d14b3622 100644 --- a/cmd/machine-controller/Dockerfile +++ b/cmd/machine-controller/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Reproducible builder image -FROM golang:1.10.0 as builder +FROM openshift/origin-release:golang-1.10 as builder WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-aws # This expects that the context passed to the docker build command is # the cluster-api-provider-aws directory.