-
Notifications
You must be signed in to change notification settings - Fork 633
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(build): Update Dockerfiles for new cloudbuild configs (#672)
* 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
Showing
5 changed files
with
15 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 kayenta-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 kayenta-web:installDist -x test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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/kayenta-web/build/install/kayenta /opt/kayenta | ||
| MAINTAINER sig-platform@spinnaker.io | ||
| COPY kayenta-web/build/install/kayenta /opt/kayenta | ||
| RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget | ||
| RUN adduser --disabled-login --system spinnaker | ||
| USER spinnaker | ||
| CMD ["/opt/kayenta/bin/kayenta"] | ||
| CMD ["/opt/kayenta/bin/kayenta"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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/kayenta-web/build/install/kayenta /opt/kayenta | ||
| MAINTAINER sig-platform@spinnaker.io | ||
| COPY kayenta-web/build/install/kayenta /opt/kayenta | ||
| RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget | ||
| RUN adduser --disabled-login --system spinnaker | ||
| USER spinnaker | ||
| CMD ["/opt/kayenta/bin/kayenta"] | ||
| CMD ["/opt/kayenta/bin/kayenta"] |