This repository has been archived by the owner on Jun 29, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 46
Issue 113 keys multi build and 103 slim JDKs (with base image) #122
Closed
gregw
wants to merge
13
commits into
appropriate:master
from
jetty-project:issue-113-keys-multi-build-2
Closed
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
d32c229
Issue #113
gregw c63481d
Merge branch 'master' into issue-113-keys-multi-build
gregw 072958d
remove alpine reference
gregw 1aa7db4
Issue #113 and #103
gregw 69d49f2
added jre11-slim
gregw 5d94d03
added jre11-slim
gregw 4c04e09
removed variants from update script
gregw 4d81b7a
removed variants from generate-stackbrew-library
gregw 26e7bf2
Added a template Dockerfile for 9.4 images
gregw e6cb790
use only a single stage
gregw a6aa234
build jetty-base in base image as well
gregw d5a72e0
alternate approach for #113 to use a base image for 9.4
gregw ffc22db
fix ordering of images
gregw 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
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 |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| # DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh | ||
| FROM openjdk:13-jdk-slim | ||
|
|
||
| ENV JETTY_HOME /usr/local/jetty | ||
| ENV JETTY_BASE /var/lib/jetty | ||
| ENV TMPDIR /tmp/jetty | ||
| ENV PATH $JETTY_HOME/bin:$PATH | ||
|
|
||
| COPY --from=jetty:9.4-jdk13 $JETTY_HOME $JETTY_HOME | ||
| COPY --from=jetty:9.4-jdk13 $JETTY_BASE $JETTY_BASE | ||
|
|
||
| RUN set -xe \ | ||
| && mkdir -p "$TMPDIR" \ | ||
| && groupadd -r jetty && useradd -r -g jetty jetty \ | ||
| && chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" \ | ||
| && rm -rf /tmp/hsperfdata_root | ||
|
|
||
| WORKDIR $JETTY_BASE | ||
| COPY docker-entrypoint.sh generate-jetty-start.sh / | ||
|
|
||
| USER jetty | ||
| EXPOSE 8080 | ||
| ENTRYPOINT ["/docker-entrypoint.sh"] | ||
| CMD ["java","-jar","/usr/local/jetty/start.jar"] | ||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| amd64, arm64v8 |
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 |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| #!/bin/sh | ||
|
|
||
| set -e | ||
|
|
||
| if [ "$1" = jetty.sh ]; then | ||
| if ! command -v bash >/dev/null 2>&1 ; then | ||
| cat >&2 <<- 'EOWARN' | ||
| ******************************************************************** | ||
| ERROR: bash not found. Use of jetty.sh requires bash. | ||
| ******************************************************************** | ||
| EOWARN | ||
| exit 1 | ||
| fi | ||
| cat >&2 <<- 'EOWARN' | ||
| ******************************************************************** | ||
| WARNING: Use of jetty.sh from this image is deprecated and may | ||
| be removed at some point in the future. | ||
|
|
||
| See the documentation for guidance on extending this image: | ||
| https://github.com/docker-library/docs/tree/master/jetty | ||
| ******************************************************************** | ||
| EOWARN | ||
| fi | ||
|
|
||
| if ! command -v -- "$1" >/dev/null 2>&1 ; then | ||
| set -- java -jar "$JETTY_HOME/start.jar" "$@" | ||
| fi | ||
|
|
||
| : ${TMPDIR:=/tmp/jetty} | ||
| [ -d "$TMPDIR" ] || mkdir -p $TMPDIR 2>/dev/null | ||
|
|
||
| : ${JETTY_START:=$JETTY_BASE/jetty.start} | ||
|
|
||
| case "$JAVA_OPTIONS" in | ||
| *-Djava.io.tmpdir=*) ;; | ||
| *) JAVA_OPTIONS="-Djava.io.tmpdir=$TMPDIR $JAVA_OPTIONS" ;; | ||
| esac | ||
|
|
||
| if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then | ||
| # this is a command to run jetty | ||
|
|
||
| # check if it is a terminating command | ||
| for A in "$@" ; do | ||
| case $A in | ||
| --add-to-start* |\ | ||
| --create-files |\ | ||
| --create-startd |\ | ||
| --download |\ | ||
| --dry-run |\ | ||
| --exec-print |\ | ||
| --help |\ | ||
| --info |\ | ||
| --list-all-modules |\ | ||
| --list-classpath |\ | ||
| --list-config |\ | ||
| --list-modules* |\ | ||
| --stop |\ | ||
| --update-ini |\ | ||
| --version |\ | ||
| -v )\ | ||
| # It is a terminating command, so exec directly | ||
| JAVA="$1" | ||
| shift | ||
| exec $JAVA $JAVA_OPTIONS "$@" | ||
| esac | ||
| done | ||
|
|
||
| if [ $(whoami) != "jetty" ]; then | ||
| cat >&2 <<- EOWARN | ||
| ******************************************************************** | ||
| WARNING: User is $(whoami) | ||
| The user should be (re)set to 'jetty' in the Dockerfile | ||
| ******************************************************************** | ||
| EOWARN | ||
| fi | ||
|
|
||
| if [ -f $JETTY_START ] ; then | ||
| if [ $JETTY_BASE/start.d -nt $JETTY_START ] ; then | ||
| cat >&2 <<- EOWARN | ||
| ******************************************************************** | ||
| WARNING: The $JETTY_BASE/start.d directory has been modified since | ||
| the $JETTY_START files was generated. Either delete | ||
| the $JETTY_START file or re-run | ||
| /generate-jetty.start.sh | ||
| from a Dockerfile | ||
| ******************************************************************** | ||
| EOWARN | ||
| fi | ||
| echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START | ||
| set -- $(cat $JETTY_START) | ||
| else | ||
| # Do a jetty dry run to set the final command | ||
| JAVA="$1" | ||
| shift | ||
| $JAVA $JAVA_OPTIONS "$@" --dry-run > $JETTY_START | ||
| if [ $(egrep -v '\\$' $JETTY_START | wc -l ) -gt 1 ] ; then | ||
| # command was more than a dry-run | ||
| cat $JETTY_START \ | ||
| | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' \ | ||
| | egrep -v '[^ ]*java .* org\.eclipse\.jetty\.xml\.XmlConfiguration ' | ||
| exit | ||
| fi | ||
| set -- $(sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//' $JETTY_START) | ||
| fi | ||
| fi | ||
|
|
||
| if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then | ||
| JAVA="$1" | ||
| shift | ||
| set -- "$JAVA" $JAVA_OPTIONS "$@" | ||
| fi | ||
|
|
||
| exec "$@" |
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 |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| #!/bin/sh | ||
|
|
||
| if [ -z "$JETTY_START" ] ; then | ||
| JETTY_START=$JETTY_BASE/jetty.start | ||
| fi | ||
| rm -f $JETTY_START | ||
| /docker-entrypoint.sh --dry-run | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//' > $JETTY_START |
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 |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| # DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh | ||
| FROM openjdk:13-jdk AS Jetty94 | ||
|
|
||
| ENV JETTY_VERSION 9.4.24.v20191120 | ||
| ENV JETTY_HOME /usr/local/jetty | ||
| ENV JETTY_BASE /var/lib/jetty | ||
| ENV TMPDIR /tmp/jetty | ||
| ENV PATH $JETTY_HOME/bin:$PATH | ||
| ENV JETTY_TGZ_URL https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/$JETTY_VERSION/jetty-home-$JETTY_VERSION.tar.gz | ||
|
|
||
| # GPG Keys are personal keys of Jetty committers (see https://github.com/eclipse/jetty.project/blob/0607c0e66e44b9c12a62b85551da3a0edce0281e/KEYS.txt) | ||
| ENV JETTY_GPG_KEYS \ | ||
| # Jan Bartel <janb@mortbay.com> | ||
| AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ | ||
| # Jesse McConnell <jesse.mcconnell@gmail.com> | ||
| 2A684B57436A81FA8706B53C61C3351A438A3B7D \ | ||
| # Joakim Erdfelt <joakim.erdfelt@gmail.com> | ||
| 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ | ||
| # Joakim Erdfelt <joakim@apache.org> | ||
| B59B67FD7904984367F931800818D9D68FB67BAC \ | ||
| # Joakim Erdfelt <joakim@erdfelt.com> | ||
| BFBB21C246D7776836287A48A04E0C74ABB35FEA \ | ||
| # Simone Bordet <simone.bordet@gmail.com> | ||
| 8B096546B1A8F02656B15D3B1677D141BCF3584D \ | ||
| # Greg Wilkins <gregw@webtide.com> | ||
| FBA2B18D238AB852DF95745C76157BDF03D0DCD6 \ | ||
| # Greg Wilkins <gregw@webtide.com> | ||
| 5C9579B3DB2E506429319AAEF33B071B29559E1E | ||
|
|
||
| RUN set -xe \ | ||
| && mkdir /jetty-keys \ | ||
| && for key in $JETTY_GPG_KEYS; do \ | ||
| GNUPGHOME=/jetty-keys gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \ | ||
| && mkdir -p "$JETTY_HOME" \ | ||
| && cd $JETTY_HOME \ | ||
| && curl -SL "$JETTY_TGZ_URL" -o jetty.tar.gz \ | ||
| && curl -SL "$JETTY_TGZ_URL.asc" -o jetty.tar.gz.asc \ | ||
| && GNUPGHOME=/jetty-keys gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz \ | ||
| && tar -xvf jetty.tar.gz --strip-components=1 \ | ||
| && sed -i '/jetty-logging/d' etc/jetty.conf \ | ||
| && rm -fr jetty.tar.gz* /jetty-keys \ | ||
| && mkdir -p "$JETTY_BASE" \ | ||
| && cd $JETTY_BASE \ | ||
| && java -jar "$JETTY_HOME/start.jar" --create-startd --add-to-start="server,http,deploy,jsp,jstl,ext,resources,websocket" \ | ||
| && mkdir -p "$TMPDIR" \ | ||
| && groupadd -r jetty && useradd -r -g jetty jetty \ | ||
| && chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" \ | ||
| && rm -rf /tmp/hsperfdata_root | ||
|
|
||
| WORKDIR $JETTY_BASE | ||
| COPY docker-entrypoint.sh generate-jetty-start.sh / | ||
|
|
||
| USER jetty | ||
| EXPOSE 8080 | ||
| ENTRYPOINT ["/docker-entrypoint.sh"] | ||
| CMD ["java","-jar","/usr/local/jetty/start.jar"] | ||
|
|
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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| amd64, arm64v8 |
Oops, something went wrong.
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.
I don't think that copying from external image is the best approach.
It means you should have it built already before doing other builds. Docker will not pull it automagically.
The issue is seen in Travis, it was unable to find non-existing image. And there is no way to build particular images in isolation.
I suggest to include all the commands to build basic Jetty 9.4 container (let's assume on
openjdk:latest) as a first stage of allDockerfiles for creating images with9.4. Since you're going to use templating with the script, it is rather easy to do.This way
Dockerfiles would became independent of each other, and layers cache would be used as well to speed up the process when building multiple images (in CI).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.
So you are saying that #121 is the best approach?
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.
Seems to be so, I haven't looked too deep on it in the first place... Great minds think alike 😄