Skip to content

Commit

Permalink
chore(build): Update Dockerfiles for new cloudbuild configs (#4332)
Browse files Browse the repository at this point in the history
* chore(build): Update Dockerfiles for new cloudbuild configs

See spinnaker/buildtool#14

* chore(dockerfile): use openjdk:8 instead of rolling our own
  • Loading branch information
plumpy authored Feb 25, 2020
1 parent d202c21 commit ca4cd4a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 18 deletions.
13 changes: 5 additions & 8 deletions Dockerfile.compile
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
FROM gcr.io/spinnaker-marketplace/gradle_cache
MAINTAINER delivery-engineering@netflix.com

ENV GRADLE_USER_HOME /gradle_cache/.gradle
COPY . compiled_sources
WORKDIR compiled_sources

RUN ./gradlew clouddriver-web:installDist -x test
FROM openjdk:8
MAINTAINER sig-platform@spinnaker.io
ENV GRADLE_USER_HOME /workspace/.gradle
ENV GRADLE_OPTS -Xmx2048m
CMD ./gradlew clouddriver-web:installDist -x test
4 changes: 2 additions & 2 deletions Dockerfile.java8
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.11
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/clouddriver-web/build/install/clouddriver /opt/clouddriver
MAINTAINER sig-platform@spinnaker.io
COPY clouddriver-web/build/install/clouddriver /opt/clouddriver

ENV KUBECTL_VERSION v1.16.0

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.slim
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.11
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/clouddriver-web/build/install/clouddriver /opt/clouddriver
MAINTAINER sig-platform@spinnaker.io
COPY clouddriver-web/build/install/clouddriver /opt/clouddriver

ENV KUBECTL_VERSION v1.16.0

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:bionic
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/clouddriver-web/build/install/clouddriver /opt/clouddriver
MAINTAINER sig-platform@spinnaker.io
COPY clouddriver-web/build/install/clouddriver /opt/clouddriver

RUN apt-get update && apt-get install -y curl gnupg && \
curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
Expand All @@ -23,4 +23,4 @@ RUN curl -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-

RUN adduser --disabled-login --system spinnaker
USER spinnaker
CMD ["/opt/clouddriver/bin/clouddriver"]
CMD ["/opt/clouddriver/bin/clouddriver"]
6 changes: 3 additions & 3 deletions Dockerfile.ubuntu-java8
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:bionic
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/clouddriver-web/build/install/clouddriver /opt/clouddriver
MAINTAINER sig-platform@spinnaker.io
COPY clouddriver-web/build/install/clouddriver /opt/clouddriver

RUN apt-get update && apt-get install -y curl gnupg && \
curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
Expand All @@ -23,4 +23,4 @@ RUN curl -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-

RUN adduser --disabled-login --system spinnaker
USER spinnaker
CMD ["/opt/clouddriver/bin/clouddriver"]
CMD ["/opt/clouddriver/bin/clouddriver"]

0 comments on commit ca4cd4a

Please sign in to comment.