Skip to content

Commit

Permalink
chore(build): Update Dockerfiles for new cloudbuild configs (#632)
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 2f1c0ed commit 9ec47d3
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 15 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 [email protected]
ENV GRADLE_USER_HOME /gradle_cache/.gradle
COPY . compiled_sources
WORKDIR compiled_sources
RUN ./gradlew --no-daemon clean igor-web:installDist -x test
FROM openjdk:8
MAINTAINER [email protected]
ENV GRADLE_USER_HOME /workspace/.gradle
ENV GRADLE_OPTS -Xmx2048m
CMD ./gradlew --no-daemon igor-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 [email protected]
COPY --from=compile /compiled_sources/igor-web/build/install/igor /opt/igor
MAINTAINER [email protected]
COPY igor-web/build/install/igor /opt/igor
RUN apk --no-cache add --update bash openjdk8-jre
RUN adduser -D -S spinnaker
USER spinnaker
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 [email protected]
COPY --from=compile /compiled_sources/igor-web/build/install/igor /opt/igor
MAINTAINER [email protected]
COPY igor-web/build/install/igor /opt/igor
RUN apk --no-cache add --update bash openjdk11-jre
RUN adduser -D -S spinnaker
USER spinnaker
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:bionic
MAINTAINER [email protected]
COPY --from=compile /compiled_sources/igor-web/build/install/igor /opt/igor
MAINTAINER [email protected]
COPY igor-web/build/install/igor /opt/igor
RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget
RUN adduser --disabled-login --system spinnaker
USER spinnaker
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.ubuntu-java8
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:bionic
MAINTAINER [email protected]
COPY --from=compile /compiled_sources/igor-web/build/install/igor /opt/igor
MAINTAINER [email protected]
COPY igor-web/build/install/igor /opt/igor
RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget
RUN adduser --disabled-login --system spinnaker
USER spinnaker
CMD ["/opt/igor/bin/igor"]
CMD ["/opt/igor/bin/igor"]

0 comments on commit 9ec47d3

Please sign in to comment.