Skip to content

Commit

Permalink
chore(build): Update Dockerfiles for new cloudbuild configs (#3450)
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 committed Feb 25, 2020
1 parent a2260b1 commit 38683f4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 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 orca-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 orca-web:installDist -x test
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/orca-web/build/install/orca /opt/orca
MAINTAINER sig-platform@spinnaker.io
COPY orca-web/build/install/orca /opt/orca
RUN apk --no-cache add --update bash openjdk8-jre
RUN adduser -D -S spinnaker
RUN mkdir plugins && chown -R 100:100 plugins
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/orca-web/build/install/orca /opt/orca
MAINTAINER sig-platform@spinnaker.io
COPY orca-web/build/install/orca /opt/orca
RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget
RUN adduser --disabled-login --system spinnaker
RUN mkdir plugins && chown -R 102:nogroup plugins
Expand Down

0 comments on commit 38683f4

Please sign in to comment.