Skip to content

Commit

Permalink
chore(build): Update Dockerfiles for new cloudbuild configs
Browse files Browse the repository at this point in the history
  • Loading branch information
plumpy committed Feb 18, 2020
1 parent ef1e3df commit b840d07
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
14 changes: 8 additions & 6 deletions Dockerfile.compile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
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 fiat-web:installDist -x test
FROM ubuntu:eoan
MAINTAINER sig-platform@spinnaker.io

RUN apt-get update && apt-get -y upgrade && apt-get install -y openjdk-8-jdk-headless && apt-get clean

ENV GRADLE_USER_HOME /workspace/.gradle
ENV GRADLE_OPTS -Xmx2048m
CMD ./gradlew --no-daemon fiat-web:installDist -x test
2 changes: 1 addition & 1 deletion 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/fiat-web/build/install/fiat /opt/fiat
COPY fiat-web/build/install/fiat /opt/fiat
RUN apk --no-cache add --update bash openjdk8-jre
RUN adduser -D -S spinnaker
USER spinnaker
Expand Down
2 changes: 1 addition & 1 deletion 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/fiat-web/build/install/fiat /opt/fiat
COPY fiat-web/build/install/fiat /opt/fiat
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,7 +1,7 @@
FROM ubuntu:bionic
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/fiat-web/build/install/fiat /opt/fiat
COPY fiat-web/build/install/fiat /opt/fiat
RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget
RUN adduser --disabled-login --system spinnaker
USER spinnaker
CMD ["/opt/fiat/bin/fiat"]
CMD ["/opt/fiat/bin/fiat"]
4 changes: 2 additions & 2 deletions Dockerfile.ubuntu-java8
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:bionic
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/fiat-web/build/install/fiat /opt/fiat
COPY fiat-web/build/install/fiat /opt/fiat
RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget
RUN adduser --disabled-login --system spinnaker
USER spinnaker
CMD ["/opt/fiat/bin/fiat"]
CMD ["/opt/fiat/bin/fiat"]

0 comments on commit b840d07

Please sign in to comment.