Skip to content

Commit

Permalink
chore(build): Update Dockerfiles for new cloudbuild configs (#533)
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 737bcc8 commit bd12136
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 22 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 rosco-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 rosco-web:installDist -x test
8 changes: 4 additions & 4 deletions Dockerfile.java8
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM alpine:3.11
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/rosco-web/build/install/rosco /opt/rosco
COPY --from=compile /compiled_sources/rosco-web/config /opt/rosco
COPY --from=compile /compiled_sources/rosco-web/config/packer /opt/rosco/config/packer
MAINTAINER sig-platform@spinnaker.io
COPY rosco-web/build/install/rosco /opt/rosco
COPY rosco-web/config /opt/rosco
COPY rosco-web/config/packer /opt/rosco/config/packer

WORKDIR /packer

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.slim
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM alpine:3.11
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/rosco-web/build/install/rosco /opt/rosco
COPY --from=compile /compiled_sources/rosco-web/config /opt/rosco
COPY --from=compile /compiled_sources/rosco-web/config/packer /opt/rosco/config/packer
MAINTAINER sig-platform@spinnaker.io
COPY rosco-web/build/install/rosco /opt/rosco
COPY rosco-web/config /opt/rosco
COPY rosco-web/config/packer /opt/rosco/config/packer

WORKDIR /packer

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM ubuntu:bionic
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/rosco-web/build/install/rosco /opt/rosco
COPY --from=compile /compiled_sources/rosco-web/config /opt/rosco
COPY --from=compile /compiled_sources/rosco-web/config/packer /opt/rosco/config/packer
MAINTAINER sig-platform@spinnaker.io
COPY rosco-web/build/install/rosco /opt/rosco
COPY rosco-web/config /opt/rosco
COPY rosco-web/config/packer /opt/rosco/config/packer

WORKDIR /packer

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.ubuntu-java8
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM ubuntu:bionic
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/rosco-web/build/install/rosco /opt/rosco
COPY --from=compile /compiled_sources/rosco-web/config /opt/rosco
COPY --from=compile /compiled_sources/rosco-web/config/packer /opt/rosco/config/packer
MAINTAINER sig-platform@spinnaker.io
COPY rosco-web/build/install/rosco /opt/rosco
COPY rosco-web/config /opt/rosco
COPY rosco-web/config/packer /opt/rosco/config/packer

WORKDIR /packer

Expand Down

0 comments on commit bd12136

Please sign in to comment.