Skip to content

Use openshift/origin-base as an image base #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 3 commits into from
Aug 24, 2018
Merged

Use openshift/origin-base as an image base #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5c5890
use openshift/origin-base
paulfantom Aug 20, 2018
c0d4488
change to openshift/origin-release:golang-1.10
paulfantom Aug 24, 2018
73629fb
change to openshift/origin-release:golang-1.10
paulfantom Aug 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/cluster-controller/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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 .
6 changes: 3 additions & 3 deletions cmd/machine-controller/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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 .