Skip to content

Commit

Permalink
chore(build): Update Dockerfiles for new cloudbuild configs (#783)
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 afd73ca commit 5610eeb
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 19 deletions.
11 changes: 5 additions & 6 deletions Dockerfile.compile
Original file line number Diff line number Diff line change
@@ -1,6 +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 --no-daemon echo-web:installDist -x test
FROM openjdk:8
MAINTAINER sig-platform@spinnaker.io
ENV GRADLE_USER_HOME /workspace/.gradle
ENV GRADLE_OPTS -Xmx2048m
CMD ./gradlew --no-daemon echo-web:installDist -x test
6 changes: 3 additions & 3 deletions Dockerfile.java8
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Not using the alpine image because it lacks a package gRPC needed to establish pub/sub listeners.
FROM openjdk:8
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/echo-web/build/install/echo /opt/echo
MAINTAINER sig-platform@spinnaker.io
COPY echo-web/build/install/echo /opt/echo

RUN adduser --disabled-login --system spinnaker
USER spinnaker
CMD ["/opt/echo/bin/echo"]
CMD ["/opt/echo/bin/echo"]
4 changes: 2 additions & 2 deletions Dockerfile.slim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Not using the alpine image because it lacks a package gRPC needed to establish pub/sub listeners.
FROM openjdk:11
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/echo-web/build/install/echo /opt/echo
MAINTAINER sig-platform@spinnaker.io
COPY echo-web/build/install/echo /opt/echo

RUN adduser --disabled-login --system spinnaker
USER spinnaker
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@

FROM ubuntu:bionic
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/echo-web/build/install/echo /opt/echo
MAINTAINER sig-platform@spinnaker.io
COPY echo-web/build/install/echo /opt/echo
RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget
RUN adduser --disabled-login --system spinnaker
USER spinnaker
CMD ["/opt/echo/bin/echo"]
CMD ["/opt/echo/bin/echo"]
7 changes: 3 additions & 4 deletions Dockerfile.ubuntu-java8
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@

FROM ubuntu:bionic
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/echo-web/build/install/echo /opt/echo
MAINTAINER sig-platform@spinnaker.io
COPY echo-web/build/install/echo /opt/echo
RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget
RUN adduser --disabled-login --system spinnaker
USER spinnaker
CMD ["/opt/echo/bin/echo"]
CMD ["/opt/echo/bin/echo"]

0 comments on commit 5610eeb

Please sign in to comment.