Skip to content

Commit

Permalink
Revert "Backend - Starting the api-server container build from scratch (
Browse files Browse the repository at this point in the history
#1699)"

This reverts commit 24347fb.
  • Loading branch information
Ark-kun authored Aug 6, 2019
1 parent 4fb329e commit b0b759b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
6 changes: 3 additions & 3 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM l.gcr.io/google/bazel:0.24.0 as builder

RUN apt-get update && \
apt-get install -y cmake clang musl-dev openssl ca-certificates
apt-get install -y cmake clang musl-dev openssl
WORKDIR /go/src/github.com/kubeflow/pipelines

COPY WORKSPACE WORKSPACE
Expand Down Expand Up @@ -31,7 +31,7 @@ COPY ./samples .
#The "for" loop breaks on all whitespace, so we either need to override IFS or use the "read" command instead.
RUN find core -maxdepth 2 -name '*.py' -type f | while read pipeline; do dsl-compile --py "$pipeline" --output "$pipeline.tar.gz"; done

FROM scratch
FROM debian:stretch

ARG COMMIT_SHA=unknown
ENV COMMIT_SHA=${COMMIT_SHA}
Expand All @@ -45,7 +45,7 @@ COPY backend/src/apiserver/config/ /config
COPY --from=compiler /samples/ /samples/

# Adding CA certificate so API server can download pipeline through URL
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
RUN apt-get update && apt-get install -y ca-certificates

# Expose apiserver port
EXPOSE 8888
Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile.persistenceagent
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apk update && apk upgrade && \

RUN GO111MODULE=on go build -o /bin/persistence_agent backend/src/agent/persistence/*.go

FROM scratch
FROM alpine:3.8
WORKDIR /bin

COPY --from=builder /bin/persistence_agent /bin/persistence_agent
Expand Down
3 changes: 2 additions & 1 deletion backend/Dockerfile.scheduledworkflow
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ RUN apk update && apk upgrade && \

RUN GO111MODULE=on go build -o /bin/controller backend/src/crd/controller/scheduledworkflow/*.go

FROM scratch
FROM alpine:3.8
WORKDIR /bin

COPY --from=builder /bin/controller /bin/controller
COPY --from=builder /go/src/github.com/kubeflow/pipelines/third_party/license.txt /bin/license.txt
RUN chmod +x /bin/controller

ENV NAMESPACE ""

Expand Down
3 changes: 2 additions & 1 deletion backend/Dockerfile.viewercontroller
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ COPY . .
RUN go mod vendor
RUN go build -o /bin/controller backend/src/crd/controller/viewer/*.go

FROM scratch
FROM alpine
WORKDIR /src
COPY --from=builder /src/github.com/kubeflow/pipelines/vendor vendor

WORKDIR /bin

COPY --from=builder /bin/controller /bin/controller
COPY --from=builder /src/github.com/kubeflow/pipelines/third_party/license.txt /bin/license.txt
RUN chmod +x /bin/controller

ENV MAX_NUM_VIEWERS "50"
ENV NAMESPACE "kubeflow"
Expand Down

0 comments on commit b0b759b

Please sign in to comment.