diff --git a/eclipse-temurin/10.0.21/jdk11-alpine/Dockerfile b/eclipse-temurin/10.0.21/jdk11-alpine/Dockerfile deleted file mode 100644 index a9b60a9..0000000 --- a/eclipse-temurin/10.0.21/jdk11-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:11-jdk-alpine - -ENV JETTY_VERSION 10.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/10.0.21/jdk11-alpine/arches b/eclipse-temurin/10.0.21/jdk11-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/10.0.21/jdk11-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/10.0.21/jdk11-alpine/docker-entrypoint.sh b/eclipse-temurin/10.0.21/jdk11-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/10.0.21/jdk11-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/10.0.21/jdk11-alpine/generate-jetty-start.sh b/eclipse-temurin/10.0.21/jdk11-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/10.0.21/jdk11-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/10.0.21/jdk11/Dockerfile b/eclipse-temurin/10.0.21/jdk11/Dockerfile deleted file mode 100644 index 03dbdc5..0000000 --- a/eclipse-temurin/10.0.21/jdk11/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:11-jdk-focal - -ENV JETTY_VERSION 10.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/10.0.21/jdk11/docker-entrypoint.sh b/eclipse-temurin/10.0.21/jdk11/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/10.0.21/jdk11/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/10.0.21/jdk11/generate-jetty-start.sh b/eclipse-temurin/10.0.21/jdk11/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/10.0.21/jdk11/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/10.0.21/jdk17-alpine/Dockerfile b/eclipse-temurin/10.0.21/jdk17-alpine/Dockerfile deleted file mode 100644 index 7009416..0000000 --- a/eclipse-temurin/10.0.21/jdk17-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:17-jdk-alpine - -ENV JETTY_VERSION 10.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/10.0.21/jdk17-alpine/arches b/eclipse-temurin/10.0.21/jdk17-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/10.0.21/jdk17-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/10.0.21/jdk17-alpine/docker-entrypoint.sh b/eclipse-temurin/10.0.21/jdk17-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/10.0.21/jdk17-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/10.0.21/jdk17-alpine/generate-jetty-start.sh b/eclipse-temurin/10.0.21/jdk17-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/10.0.21/jdk17-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/10.0.21/jdk17/Dockerfile b/eclipse-temurin/10.0.21/jdk17/Dockerfile deleted file mode 100644 index 68085bf..0000000 --- a/eclipse-temurin/10.0.21/jdk17/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:17-jdk-focal - -ENV JETTY_VERSION 10.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/10.0.21/jdk17/docker-entrypoint.sh b/eclipse-temurin/10.0.21/jdk17/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/10.0.21/jdk17/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/10.0.21/jdk17/generate-jetty-start.sh b/eclipse-temurin/10.0.21/jdk17/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/10.0.21/jdk17/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/10.0.21/jdk21-alpine/Dockerfile b/eclipse-temurin/10.0.21/jdk21-alpine/Dockerfile deleted file mode 100644 index 7cfd3af..0000000 --- a/eclipse-temurin/10.0.21/jdk21-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:21-jdk-alpine - -ENV JETTY_VERSION 10.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/10.0.21/jdk21-alpine/arches b/eclipse-temurin/10.0.21/jdk21-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/10.0.21/jdk21-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/10.0.21/jdk21-alpine/docker-entrypoint.sh b/eclipse-temurin/10.0.21/jdk21-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/10.0.21/jdk21-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/10.0.21/jdk21-alpine/generate-jetty-start.sh b/eclipse-temurin/10.0.21/jdk21-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/10.0.21/jdk21-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/10.0.21/jdk21/Dockerfile b/eclipse-temurin/10.0.21/jdk21/Dockerfile deleted file mode 100644 index 7a2edff..0000000 --- a/eclipse-temurin/10.0.21/jdk21/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:21-jdk - -ENV JETTY_VERSION 10.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/10.0.21/jdk21/docker-entrypoint.sh b/eclipse-temurin/10.0.21/jdk21/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/10.0.21/jdk21/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/10.0.21/jdk21/generate-jetty-start.sh b/eclipse-temurin/10.0.21/jdk21/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/10.0.21/jdk21/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/10.0.21/jre11-alpine/Dockerfile b/eclipse-temurin/10.0.21/jre11-alpine/Dockerfile deleted file mode 100644 index a266fa2..0000000 --- a/eclipse-temurin/10.0.21/jre11-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:11-jre-alpine - -ENV JETTY_VERSION 10.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/10.0.21/jre11-alpine/arches b/eclipse-temurin/10.0.21/jre11-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/10.0.21/jre11-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/10.0.21/jre11-alpine/docker-entrypoint.sh b/eclipse-temurin/10.0.21/jre11-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/10.0.21/jre11-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/10.0.21/jre11-alpine/generate-jetty-start.sh b/eclipse-temurin/10.0.21/jre11-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/10.0.21/jre11-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/10.0.21/jre11/Dockerfile b/eclipse-temurin/10.0.21/jre11/Dockerfile deleted file mode 100644 index 519afcd..0000000 --- a/eclipse-temurin/10.0.21/jre11/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:11-jre - -ENV JETTY_VERSION 10.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/10.0.21/jre11/docker-entrypoint.sh b/eclipse-temurin/10.0.21/jre11/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/10.0.21/jre11/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/10.0.21/jre11/generate-jetty-start.sh b/eclipse-temurin/10.0.21/jre11/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/10.0.21/jre11/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/10.0.21/jre17-alpine/Dockerfile b/eclipse-temurin/10.0.21/jre17-alpine/Dockerfile deleted file mode 100644 index 5d57d0f..0000000 --- a/eclipse-temurin/10.0.21/jre17-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:17-jre-alpine - -ENV JETTY_VERSION 10.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/10.0.21/jre17-alpine/arches b/eclipse-temurin/10.0.21/jre17-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/10.0.21/jre17-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/10.0.21/jre17-alpine/docker-entrypoint.sh b/eclipse-temurin/10.0.21/jre17-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/10.0.21/jre17-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/10.0.21/jre17-alpine/generate-jetty-start.sh b/eclipse-temurin/10.0.21/jre17-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/10.0.21/jre17-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/10.0.21/jre17/Dockerfile b/eclipse-temurin/10.0.21/jre17/Dockerfile deleted file mode 100644 index c5fe419..0000000 --- a/eclipse-temurin/10.0.21/jre17/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:17-jre - -ENV JETTY_VERSION 10.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/10.0.21/jre17/docker-entrypoint.sh b/eclipse-temurin/10.0.21/jre17/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/10.0.21/jre17/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/10.0.21/jre17/generate-jetty-start.sh b/eclipse-temurin/10.0.21/jre17/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/10.0.21/jre17/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/10.0.21/jre21-alpine/Dockerfile b/eclipse-temurin/10.0.21/jre21-alpine/Dockerfile deleted file mode 100644 index 7984743..0000000 --- a/eclipse-temurin/10.0.21/jre21-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:21-jre-alpine - -ENV JETTY_VERSION 10.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/10.0.21/jre21-alpine/arches b/eclipse-temurin/10.0.21/jre21-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/10.0.21/jre21-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/10.0.21/jre21-alpine/docker-entrypoint.sh b/eclipse-temurin/10.0.21/jre21-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/10.0.21/jre21-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/10.0.21/jre21-alpine/generate-jetty-start.sh b/eclipse-temurin/10.0.21/jre21-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/10.0.21/jre21-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/10.0.21/jre21/Dockerfile b/eclipse-temurin/10.0.21/jre21/Dockerfile deleted file mode 100644 index 23777d8..0000000 --- a/eclipse-temurin/10.0.21/jre21/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:21-jre - -ENV JETTY_VERSION 10.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/10.0.21/jre21/docker-entrypoint.sh b/eclipse-temurin/10.0.21/jre21/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/10.0.21/jre21/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/10.0.21/jre21/generate-jetty-start.sh b/eclipse-temurin/10.0.21/jre21/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/10.0.21/jre21/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/11.0.21/jdk11-alpine/Dockerfile b/eclipse-temurin/11.0.21/jdk11-alpine/Dockerfile deleted file mode 100644 index 1ceb7b1..0000000 --- a/eclipse-temurin/11.0.21/jdk11-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:11-jdk-alpine - -ENV JETTY_VERSION 11.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/11.0.21/jdk11-alpine/arches b/eclipse-temurin/11.0.21/jdk11-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/11.0.21/jdk11-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/11.0.21/jdk11-alpine/docker-entrypoint.sh b/eclipse-temurin/11.0.21/jdk11-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/11.0.21/jdk11-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/11.0.21/jdk11-alpine/generate-jetty-start.sh b/eclipse-temurin/11.0.21/jdk11-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/11.0.21/jdk11-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/11.0.21/jdk11/Dockerfile b/eclipse-temurin/11.0.21/jdk11/Dockerfile deleted file mode 100644 index 5ad8c24..0000000 --- a/eclipse-temurin/11.0.21/jdk11/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:11-jdk-focal - -ENV JETTY_VERSION 11.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/11.0.21/jdk11/docker-entrypoint.sh b/eclipse-temurin/11.0.21/jdk11/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/11.0.21/jdk11/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/11.0.21/jdk11/generate-jetty-start.sh b/eclipse-temurin/11.0.21/jdk11/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/11.0.21/jdk11/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/11.0.21/jdk17-alpine/Dockerfile b/eclipse-temurin/11.0.21/jdk17-alpine/Dockerfile deleted file mode 100644 index fb31f80..0000000 --- a/eclipse-temurin/11.0.21/jdk17-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:17-jdk-alpine - -ENV JETTY_VERSION 11.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/11.0.21/jdk17-alpine/arches b/eclipse-temurin/11.0.21/jdk17-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/11.0.21/jdk17-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/11.0.21/jdk17-alpine/docker-entrypoint.sh b/eclipse-temurin/11.0.21/jdk17-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/11.0.21/jdk17-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/11.0.21/jdk17-alpine/generate-jetty-start.sh b/eclipse-temurin/11.0.21/jdk17-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/11.0.21/jdk17-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/11.0.21/jdk17/Dockerfile b/eclipse-temurin/11.0.21/jdk17/Dockerfile deleted file mode 100644 index b231d32..0000000 --- a/eclipse-temurin/11.0.21/jdk17/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:17-jdk-focal - -ENV JETTY_VERSION 11.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/11.0.21/jdk17/docker-entrypoint.sh b/eclipse-temurin/11.0.21/jdk17/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/11.0.21/jdk17/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/11.0.21/jdk17/generate-jetty-start.sh b/eclipse-temurin/11.0.21/jdk17/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/11.0.21/jdk17/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/11.0.21/jdk21-alpine/Dockerfile b/eclipse-temurin/11.0.21/jdk21-alpine/Dockerfile deleted file mode 100644 index e6b6dbd..0000000 --- a/eclipse-temurin/11.0.21/jdk21-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:21-jdk-alpine - -ENV JETTY_VERSION 11.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/11.0.21/jdk21-alpine/arches b/eclipse-temurin/11.0.21/jdk21-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/11.0.21/jdk21-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/11.0.21/jdk21-alpine/docker-entrypoint.sh b/eclipse-temurin/11.0.21/jdk21-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/11.0.21/jdk21-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/11.0.21/jdk21-alpine/generate-jetty-start.sh b/eclipse-temurin/11.0.21/jdk21-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/11.0.21/jdk21-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/11.0.21/jdk21/Dockerfile b/eclipse-temurin/11.0.21/jdk21/Dockerfile deleted file mode 100644 index d887f81..0000000 --- a/eclipse-temurin/11.0.21/jdk21/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:21-jdk - -ENV JETTY_VERSION 11.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/11.0.21/jdk21/docker-entrypoint.sh b/eclipse-temurin/11.0.21/jdk21/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/11.0.21/jdk21/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/11.0.21/jdk21/generate-jetty-start.sh b/eclipse-temurin/11.0.21/jdk21/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/11.0.21/jdk21/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/11.0.21/jre11-alpine/Dockerfile b/eclipse-temurin/11.0.21/jre11-alpine/Dockerfile deleted file mode 100644 index 9f47cf8..0000000 --- a/eclipse-temurin/11.0.21/jre11-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:11-jre-alpine - -ENV JETTY_VERSION 11.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/11.0.21/jre11-alpine/arches b/eclipse-temurin/11.0.21/jre11-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/11.0.21/jre11-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/11.0.21/jre11-alpine/docker-entrypoint.sh b/eclipse-temurin/11.0.21/jre11-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/11.0.21/jre11-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/11.0.21/jre11-alpine/generate-jetty-start.sh b/eclipse-temurin/11.0.21/jre11-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/11.0.21/jre11-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/11.0.21/jre11/Dockerfile b/eclipse-temurin/11.0.21/jre11/Dockerfile deleted file mode 100644 index cab1406..0000000 --- a/eclipse-temurin/11.0.21/jre11/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:11-jre - -ENV JETTY_VERSION 11.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/11.0.21/jre11/docker-entrypoint.sh b/eclipse-temurin/11.0.21/jre11/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/11.0.21/jre11/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/11.0.21/jre11/generate-jetty-start.sh b/eclipse-temurin/11.0.21/jre11/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/11.0.21/jre11/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/11.0.21/jre17-alpine/Dockerfile b/eclipse-temurin/11.0.21/jre17-alpine/Dockerfile deleted file mode 100644 index 4881b62..0000000 --- a/eclipse-temurin/11.0.21/jre17-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:17-jre-alpine - -ENV JETTY_VERSION 11.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/11.0.21/jre17-alpine/arches b/eclipse-temurin/11.0.21/jre17-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/11.0.21/jre17-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/11.0.21/jre17-alpine/docker-entrypoint.sh b/eclipse-temurin/11.0.21/jre17-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/11.0.21/jre17-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/11.0.21/jre17-alpine/generate-jetty-start.sh b/eclipse-temurin/11.0.21/jre17-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/11.0.21/jre17-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/11.0.21/jre17/Dockerfile b/eclipse-temurin/11.0.21/jre17/Dockerfile deleted file mode 100644 index 1230ac8..0000000 --- a/eclipse-temurin/11.0.21/jre17/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:17-jre - -ENV JETTY_VERSION 11.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/11.0.21/jre17/docker-entrypoint.sh b/eclipse-temurin/11.0.21/jre17/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/11.0.21/jre17/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/11.0.21/jre17/generate-jetty-start.sh b/eclipse-temurin/11.0.21/jre17/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/11.0.21/jre17/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/11.0.21/jre21-alpine/Dockerfile b/eclipse-temurin/11.0.21/jre21-alpine/Dockerfile deleted file mode 100644 index 53d6ca8..0000000 --- a/eclipse-temurin/11.0.21/jre21-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:21-jre-alpine - -ENV JETTY_VERSION 11.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/11.0.21/jre21-alpine/arches b/eclipse-temurin/11.0.21/jre21-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/11.0.21/jre21-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/11.0.21/jre21-alpine/docker-entrypoint.sh b/eclipse-temurin/11.0.21/jre21-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/11.0.21/jre21-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/11.0.21/jre21-alpine/generate-jetty-start.sh b/eclipse-temurin/11.0.21/jre21-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/11.0.21/jre21-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/11.0.21/jre21/Dockerfile b/eclipse-temurin/11.0.21/jre21/Dockerfile deleted file mode 100644 index 3ca829b..0000000 --- a/eclipse-temurin/11.0.21/jre21/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:21-jre - -ENV JETTY_VERSION 11.0.21 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/11.0.21/jre21/docker-entrypoint.sh b/eclipse-temurin/11.0.21/jre21/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/11.0.21/jre21/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/11.0.21/jre21/generate-jetty-start.sh b/eclipse-temurin/11.0.21/jre21/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/11.0.21/jre21/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/12.0.10/jdk17-alpine/Dockerfile b/eclipse-temurin/12.0.10/jdk17-alpine/Dockerfile deleted file mode 100644 index ed99710..0000000 --- a/eclipse-temurin/12.0.10/jdk17-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:17-jdk-alpine - -ENV JETTY_VERSION 12.0.10 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/12.0.10/jdk17-alpine/arches b/eclipse-temurin/12.0.10/jdk17-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/12.0.10/jdk17-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/12.0.10/jdk17-alpine/docker-entrypoint.sh b/eclipse-temurin/12.0.10/jdk17-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/12.0.10/jdk17-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/12.0.10/jdk17-alpine/generate-jetty-start.sh b/eclipse-temurin/12.0.10/jdk17-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/12.0.10/jdk17-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/12.0.10/jdk17/Dockerfile b/eclipse-temurin/12.0.10/jdk17/Dockerfile deleted file mode 100644 index 38c04ed..0000000 --- a/eclipse-temurin/12.0.10/jdk17/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:17-jdk - -ENV JETTY_VERSION 12.0.10 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/12.0.10/jdk17/docker-entrypoint.sh b/eclipse-temurin/12.0.10/jdk17/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/12.0.10/jdk17/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/12.0.10/jdk17/generate-jetty-start.sh b/eclipse-temurin/12.0.10/jdk17/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/12.0.10/jdk17/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/12.0.10/jdk21-alpine/Dockerfile b/eclipse-temurin/12.0.10/jdk21-alpine/Dockerfile deleted file mode 100644 index 146e174..0000000 --- a/eclipse-temurin/12.0.10/jdk21-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:21-jdk-alpine - -ENV JETTY_VERSION 12.0.10 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/12.0.10/jdk21-alpine/arches b/eclipse-temurin/12.0.10/jdk21-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/12.0.10/jdk21-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/12.0.10/jdk21-alpine/docker-entrypoint.sh b/eclipse-temurin/12.0.10/jdk21-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/12.0.10/jdk21-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/12.0.10/jdk21-alpine/generate-jetty-start.sh b/eclipse-temurin/12.0.10/jdk21-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/12.0.10/jdk21-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/12.0.10/jdk21/Dockerfile b/eclipse-temurin/12.0.10/jdk21/Dockerfile deleted file mode 100644 index 4b1bb72..0000000 --- a/eclipse-temurin/12.0.10/jdk21/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:21-jdk - -ENV JETTY_VERSION 12.0.10 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/12.0.10/jdk21/docker-entrypoint.sh b/eclipse-temurin/12.0.10/jdk21/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/12.0.10/jdk21/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/12.0.10/jdk21/generate-jetty-start.sh b/eclipse-temurin/12.0.10/jdk21/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/12.0.10/jdk21/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/12.0.10/jre17-alpine/Dockerfile b/eclipse-temurin/12.0.10/jre17-alpine/Dockerfile deleted file mode 100644 index 9573de3..0000000 --- a/eclipse-temurin/12.0.10/jre17-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:17-jre-alpine - -ENV JETTY_VERSION 12.0.10 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/12.0.10/jre17-alpine/arches b/eclipse-temurin/12.0.10/jre17-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/12.0.10/jre17-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/12.0.10/jre17-alpine/docker-entrypoint.sh b/eclipse-temurin/12.0.10/jre17-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/12.0.10/jre17-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/12.0.10/jre17-alpine/generate-jetty-start.sh b/eclipse-temurin/12.0.10/jre17-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/12.0.10/jre17-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/12.0.10/jre17/Dockerfile b/eclipse-temurin/12.0.10/jre17/Dockerfile deleted file mode 100644 index 05d7d2f..0000000 --- a/eclipse-temurin/12.0.10/jre17/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:17-jre - -ENV JETTY_VERSION 12.0.10 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/12.0.10/jre17/docker-entrypoint.sh b/eclipse-temurin/12.0.10/jre17/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/12.0.10/jre17/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/12.0.10/jre17/generate-jetty-start.sh b/eclipse-temurin/12.0.10/jre17/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/12.0.10/jre17/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/12.0.10/jre21-alpine/Dockerfile b/eclipse-temurin/12.0.10/jre21-alpine/Dockerfile deleted file mode 100644 index a61e74e..0000000 --- a/eclipse-temurin/12.0.10/jre21-alpine/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh -FROM eclipse-temurin:21-jre-alpine - -ENV JETTY_VERSION 12.0.10 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - addgroup -S jetty && adduser -h $JETTY_BASE -S jetty -G jetty; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/12.0.10/jre21-alpine/arches b/eclipse-temurin/12.0.10/jre21-alpine/arches deleted file mode 100644 index 33a9268..0000000 --- a/eclipse-temurin/12.0.10/jre21-alpine/arches +++ /dev/null @@ -1 +0,0 @@ -amd64 \ No newline at end of file diff --git a/eclipse-temurin/12.0.10/jre21-alpine/docker-entrypoint.sh b/eclipse-temurin/12.0.10/jre21-alpine/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/12.0.10/jre21-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/12.0.10/jre21-alpine/generate-jetty-start.sh b/eclipse-temurin/12.0.10/jre21-alpine/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/12.0.10/jre21-alpine/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi diff --git a/eclipse-temurin/12.0.10/jre21/Dockerfile b/eclipse-temurin/12.0.10/jre21/Dockerfile deleted file mode 100644 index b98279e..0000000 --- a/eclipse-temurin/12.0.10/jre21/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# DO NOT EDIT. Edit baseDockerfile-slim and use update.sh -FROM eclipse-temurin:21-jre - -ENV JETTY_VERSION 12.0.10 -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 - AED5EE6C45D0FE8D5D1B164F27DED4BF6216DB8F \ - # Jesse McConnell - 2A684B57436A81FA8706B53C61C3351A438A3B7D \ - # Joakim Erdfelt - 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4 \ - # Joakim Erdfelt - B59B67FD7904984367F931800818D9D68FB67BAC \ - # Joakim Erdfelt - BFBB21C246D7776836287A48A04E0C74ABB35FEA \ - # Simone Bordet - 8B096546B1A8F02656B15D3B1677D141BCF3584D \ - # Olivier Lamy - F254B35617DC255D9344BCFA873A8E86B4372146 \ - # Ludovic Orban - E22488CC94F63E3FC928536C4241C08270D999C3 - -RUN set -xe ; \ - # Save initial installation state - export savedAptMark="$(apt-mark showmanual)" ; \ - # - mkdir -p $TMPDIR ; \ - # - # Install utils needed to verify keys - apt-get update ; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - p11-kit \ - gnupg2 \ - curl \ - ; \ - # - # fetch GPG keys - export GNUPGHOME=/jetty-keys ; \ - mkdir -p "$GNUPGHOME" ; \ - for key in $JETTY_GPG_KEYS; do \ - gpg --batch --keyserver "hkps://keyserver.ubuntu.com" --recv-keys "$key"; \ - done ; \ - # - # Fetch jetty release into JETTY_HOME - 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 ; \ - # - # Verify GPG signatures - gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz ; \ - # - # Unpack jetty - tar -xvf jetty.tar.gz --strip-components=1 ; \ - sed -i '/jetty-logging/d' etc/jetty.conf ; \ - # - # Create and configure the JETTY_HOME directory - mkdir -p "$JETTY_BASE" ; \ - cd $JETTY_BASE ; \ - case "$JETTY_VERSION" in \ - "12."*) START_MODULES="server,http,ext,resources" ;; \ - *) START_MODULES="server,http,deploy,ext,resources,jsp,jstl,websocket" ;; \ - esac ; \ - java -jar "$JETTY_HOME/start.jar" --create-startd \ - --add-to-start="$START_MODULES" ; \ - groupadd -r jetty && useradd -r -g jetty jetty ; \ - chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ - usermod -d $JETTY_BASE jetty ; \ - gpgconf --kill all ; \ - # - # Cleanup any apt - apt-mark auto '.*' > /dev/null ; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ; \ - rm -rf /var/lib/apt/lists/* ; \ - # - # Cleanup - rm -rf /tmp/hsperfdata_root ; \ - rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - rm -fr /jetty-keys $GNUPGHOME ; \ - rm -rf /tmp/hsperfdata_root ; \ - # - # Basic smoke test - java -jar "$JETTY_HOME/start.jar" --list-config ; - -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"] diff --git a/eclipse-temurin/12.0.10/jre21/docker-entrypoint.sh b/eclipse-temurin/12.0.10/jre21/docker-entrypoint.sh deleted file mode 100755 index 573a928..0000000 --- a/eclipse-temurin/12.0.10/jre21/docker-entrypoint.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 - # The $START_OPTIONS is the JVM options for the JVM which will do the --dry-run. - # The $JAVA_OPTIONS contains the JVM options used in the output of the --dry-run command. - eval "exec $JAVA $START_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES" - 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. - To avoid regeneration delays at start, either delete - the $JETTY_START file or re-run /generate-jetty-start.sh - from a Dockerfile. - ******************************************************************** - EOWARN - /generate-jetty-start.sh "$@" - fi - echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START - else - /generate-jetty-start.sh "$@" - fi - - ## The generate-jetty-start script always starts the jetty.start file with exec, so this command will exec Jetty. - ## We need to do this because the file may have quoted arguments which cannot be read into a variable. - . $JETTY_START -fi - -if [ "${1##*/}" = java -a -n "$JAVA_OPTIONS" ] ; then - JAVA="$1" - shift - set -- "$JAVA" $JAVA_OPTIONS "$@" -fi - -exec "$@" diff --git a/eclipse-temurin/12.0.10/jre21/generate-jetty-start.sh b/eclipse-temurin/12.0.10/jre21/generate-jetty-start.sh deleted file mode 100755 index ebb75d6..0000000 --- a/eclipse-temurin/12.0.10/jre21/generate-jetty-start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if [ -z "$JETTY_START" ] ; then - JETTY_START=$JETTY_BASE/jetty.start -fi -rm -f $JETTY_START - -DRY_RUN=$(/docker-entrypoint.sh "$@" --dry-run | tee /dev/stderr) -DRY_RUN=$(echo "$DRY_RUN" \ - | egrep '[^ ]*java .*org\.eclipse\.jetty\.xml\.XmlConfiguration ' \ - | sed -e 's/ -Djava.io.tmpdir=[^ ]*//g' -e 's/\\$//') -echo "exec $DRY_RUN" > $JETTY_START - -# If jetty.start doesn't have content then the dry-run failed. -if ! [ -s $JETTY_START ]; then - echo "jetty dry run failed:" - echo "$DRY_RUN" | awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' - exit 1 -fi