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 3368f23 commit d862119
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 16 deletions.
18 changes: 12 additions & 6 deletions Dockerfile.compile
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
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 clean igor-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 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 delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/igor-web/build/install/igor /opt/igor
MAINTAINER sig-platform@spinnaker.io
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 delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/igor-web/build/install/igor /opt/igor
MAINTAINER sig-platform@spinnaker.io
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 delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/igor-web/build/install/igor /opt/igor
MAINTAINER sig-platform@spinnaker.io
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 delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/igor-web/build/install/igor /opt/igor
MAINTAINER sig-platform@spinnaker.io
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"]
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit d862119

Please sign in to comment.