-
Notifications
You must be signed in to change notification settings - Fork 652
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore(build): Update Dockerfiles for new cloudbuild configs #783
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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,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 echo-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 echo-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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| # Not using the alpine image because it lacks a package gRPC needed to establish pub/sub listeners. | ||
| FROM openjdk:8 | ||
| MAINTAINER delivery-engineering@netflix.com | ||
| COPY --from=compile /compiled_sources/echo-web/build/install/echo /opt/echo | ||
| MAINTAINER sig-platform@spinnaker.io | ||
| COPY echo-web/build/install/echo /opt/echo | ||
|
|
||
| RUN adduser --disabled-login --system spinnaker | ||
| USER spinnaker | ||
| CMD ["/opt/echo/bin/echo"] | ||
| CMD ["/opt/echo/bin/echo"] |
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,8 +1,7 @@ | ||
|
|
||
| FROM ubuntu:bionic | ||
| MAINTAINER delivery-engineering@netflix.com | ||
| COPY --from=compile /compiled_sources/echo-web/build/install/echo /opt/echo | ||
| MAINTAINER sig-platform@spinnaker.io | ||
| COPY echo-web/build/install/echo /opt/echo | ||
| RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget | ||
| RUN adduser --disabled-login --system spinnaker | ||
| USER spinnaker | ||
| CMD ["/opt/echo/bin/echo"] | ||
| CMD ["/opt/echo/bin/echo"] | ||
plumpy marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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,8 +1,7 @@ | ||
|
|
||
| FROM ubuntu:bionic | ||
| MAINTAINER delivery-engineering@netflix.com | ||
| COPY --from=compile /compiled_sources/echo-web/build/install/echo /opt/echo | ||
| MAINTAINER sig-platform@spinnaker.io | ||
| COPY echo-web/build/install/echo /opt/echo | ||
| RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget | ||
| RUN adduser --disabled-login --system spinnaker | ||
| USER spinnaker | ||
| CMD ["/opt/echo/bin/echo"] | ||
| CMD ["/opt/echo/bin/echo"] |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the past, we've had flaky container builds doing an
apt upgrade, not to mention that it takes a relatively long time. Since this is only an intermediate container, what do you think about simply basing itFROM openjdk:8, just likeDockerfile.java8?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ooh, yeah, I forgot about those. That's way better, thanks. I'll work on updating all the PRs, make sure they still build, and then update this comment when I'm done.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They all compiled fine with
openjdk:8, so I've updated all 10 of the PRs whenever you get a chance to review, thanks.