From 4c5c94b1db3250c8795524cb337e19bd3ecd9778 Mon Sep 17 00:00:00 2001 From: Mike Dillon Date: Wed, 7 Jun 2017 14:18:24 -0700 Subject: [PATCH 1/4] Upgrade to Jetty 9.2.22 --- 9.2-jre7/Dockerfile | 2 +- 9.2-jre8/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/9.2-jre7/Dockerfile b/9.2-jre7/Dockerfile index a3f529f..d82f12f 100644 --- a/9.2-jre7/Dockerfile +++ b/9.2-jre7/Dockerfile @@ -8,7 +8,7 @@ ENV PATH $JETTY_HOME/bin:$PATH RUN mkdir -p "$JETTY_HOME" WORKDIR $JETTY_HOME -ENV JETTY_VERSION 9.2.21.v20170120 +ENV JETTY_VERSION 9.2.22.v20170606 ENV JETTY_TGZ_URL https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/$JETTY_VERSION/jetty-distribution-$JETTY_VERSION.tar.gz # GPG Keys are personal keys of Jetty committers (see https://github.com/eclipse/jetty.project/blob/0607c0e66e44b9c12a62b85551da3a0edce0281e/KEYS.txt) diff --git a/9.2-jre8/Dockerfile b/9.2-jre8/Dockerfile index a26831a..78cbec5 100644 --- a/9.2-jre8/Dockerfile +++ b/9.2-jre8/Dockerfile @@ -8,7 +8,7 @@ ENV PATH $JETTY_HOME/bin:$PATH RUN mkdir -p "$JETTY_HOME" WORKDIR $JETTY_HOME -ENV JETTY_VERSION 9.2.21.v20170120 +ENV JETTY_VERSION 9.2.22.v20170606 ENV JETTY_TGZ_URL https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/$JETTY_VERSION/jetty-distribution-$JETTY_VERSION.tar.gz # GPG Keys are personal keys of Jetty committers (see https://github.com/eclipse/jetty.project/blob/0607c0e66e44b9c12a62b85551da3a0edce0281e/KEYS.txt) From f4b465c9c3fdd86801ce73192cc25189723ff611 Mon Sep 17 00:00:00 2001 From: Mike Dillon Date: Wed, 7 Jun 2017 14:18:57 -0700 Subject: [PATCH 2/4] Upgrade to Jetty 9.3.20 --- 9.3-jre8/Dockerfile | 2 +- 9.3-jre8/alpine/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/9.3-jre8/Dockerfile b/9.3-jre8/Dockerfile index 207fbca..9976396 100644 --- a/9.3-jre8/Dockerfile +++ b/9.3-jre8/Dockerfile @@ -8,7 +8,7 @@ ENV PATH $JETTY_HOME/bin:$PATH RUN mkdir -p "$JETTY_HOME" WORKDIR $JETTY_HOME -ENV JETTY_VERSION 9.3.19.v20170502 +ENV JETTY_VERSION 9.3.20.v20170531 ENV JETTY_TGZ_URL https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/$JETTY_VERSION/jetty-distribution-$JETTY_VERSION.tar.gz # GPG Keys are personal keys of Jetty committers (see https://github.com/eclipse/jetty.project/blob/0607c0e66e44b9c12a62b85551da3a0edce0281e/KEYS.txt) diff --git a/9.3-jre8/alpine/Dockerfile b/9.3-jre8/alpine/Dockerfile index 156e5b5..f4cd018 100644 --- a/9.3-jre8/alpine/Dockerfile +++ b/9.3-jre8/alpine/Dockerfile @@ -8,7 +8,7 @@ ENV PATH $JETTY_HOME/bin:$PATH RUN mkdir -p "$JETTY_HOME" WORKDIR $JETTY_HOME -ENV JETTY_VERSION 9.3.19.v20170502 +ENV JETTY_VERSION 9.3.20.v20170531 ENV JETTY_TGZ_URL https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/$JETTY_VERSION/jetty-distribution-$JETTY_VERSION.tar.gz # GPG Keys are personal keys of Jetty committers (see https://github.com/eclipse/jetty.project/blob/0607c0e66e44b9c12a62b85551da3a0edce0281e/KEYS.txt) From 26c79999c0fb7e2105cdb8374009c1885e245dea Mon Sep 17 00:00:00 2001 From: Mike Dillon Date: Wed, 7 Jun 2017 14:19:26 -0700 Subject: [PATCH 3/4] Upgrade to Jetty 9.4.6 --- 9.4-jre8/Dockerfile | 2 +- 9.4-jre8/alpine/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/9.4-jre8/Dockerfile b/9.4-jre8/Dockerfile index 677acfe..ef3f296 100644 --- a/9.4-jre8/Dockerfile +++ b/9.4-jre8/Dockerfile @@ -8,7 +8,7 @@ ENV PATH $JETTY_HOME/bin:$PATH RUN mkdir -p "$JETTY_HOME" WORKDIR $JETTY_HOME -ENV JETTY_VERSION 9.4.5.v20170502 +ENV JETTY_VERSION 9.4.6.v20170531 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) diff --git a/9.4-jre8/alpine/Dockerfile b/9.4-jre8/alpine/Dockerfile index 0e98414..1cab108 100644 --- a/9.4-jre8/alpine/Dockerfile +++ b/9.4-jre8/alpine/Dockerfile @@ -8,7 +8,7 @@ ENV PATH $JETTY_HOME/bin:$PATH RUN mkdir -p "$JETTY_HOME" WORKDIR $JETTY_HOME -ENV JETTY_VERSION 9.4.5.v20170502 +ENV JETTY_VERSION 9.4.6.v20170531 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) From cafead33ad5c46a0226bff9713719579828ace15 Mon Sep 17 00:00:00 2001 From: Mike Dillon Date: Wed, 7 Jun 2017 14:40:28 -0700 Subject: [PATCH 4/4] Use "rm -rf" to remove temporary $GNUPGHOME --- 9.2-jre7/Dockerfile | 2 +- 9.2-jre8/Dockerfile | 2 +- 9.3-jre8/Dockerfile | 2 +- 9.3-jre8/alpine/Dockerfile | 2 +- 9.4-jre8/Dockerfile | 2 +- 9.4-jre8/alpine/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/9.2-jre7/Dockerfile b/9.2-jre7/Dockerfile index d82f12f..7c731bf 100644 --- a/9.2-jre7/Dockerfile +++ b/9.2-jre7/Dockerfile @@ -37,7 +37,7 @@ RUN set -xe \ && for key in $JETTY_GPG_KEYS; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \ && gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz \ - && rm -r "$GNUPGHOME" \ + && rm -rf "$GNUPGHOME" \ && tar -xvf jetty.tar.gz --strip-components=1 \ && sed -i '/jetty-logging/d' etc/jetty.conf \ && rm -fr demo-base javadoc \ diff --git a/9.2-jre8/Dockerfile b/9.2-jre8/Dockerfile index 78cbec5..133807d 100644 --- a/9.2-jre8/Dockerfile +++ b/9.2-jre8/Dockerfile @@ -37,7 +37,7 @@ RUN set -xe \ && for key in $JETTY_GPG_KEYS; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \ && gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz \ - && rm -r "$GNUPGHOME" \ + && rm -rf "$GNUPGHOME" \ && tar -xvf jetty.tar.gz --strip-components=1 \ && sed -i '/jetty-logging/d' etc/jetty.conf \ && rm -fr demo-base javadoc \ diff --git a/9.3-jre8/Dockerfile b/9.3-jre8/Dockerfile index 9976396..feafcde 100644 --- a/9.3-jre8/Dockerfile +++ b/9.3-jre8/Dockerfile @@ -37,7 +37,7 @@ RUN set -xe \ && for key in $JETTY_GPG_KEYS; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \ && gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz \ - && rm -r "$GNUPGHOME" \ + && rm -rf "$GNUPGHOME" \ && tar -xvf jetty.tar.gz --strip-components=1 \ && sed -i '/jetty-logging/d' etc/jetty.conf \ && rm -fr demo-base javadoc \ diff --git a/9.3-jre8/alpine/Dockerfile b/9.3-jre8/alpine/Dockerfile index f4cd018..0359f0b 100644 --- a/9.3-jre8/alpine/Dockerfile +++ b/9.3-jre8/alpine/Dockerfile @@ -40,7 +40,7 @@ RUN set -xe \ && for key in $JETTY_GPG_KEYS; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \ && gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz \ - && rm -r "$GNUPGHOME" \ + && rm -rf "$GNUPGHOME" \ && tar -xvzf jetty.tar.gz \ && mv jetty-distribution-$JETTY_VERSION/* ./ \ && sed -i '/jetty-logging/d' etc/jetty.conf \ diff --git a/9.4-jre8/Dockerfile b/9.4-jre8/Dockerfile index ef3f296..d0b8d9b 100644 --- a/9.4-jre8/Dockerfile +++ b/9.4-jre8/Dockerfile @@ -37,7 +37,7 @@ RUN set -xe \ && for key in $JETTY_GPG_KEYS; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \ && gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz \ - && rm -r "$GNUPGHOME" \ + && rm -rf "$GNUPGHOME" \ && tar -xvf jetty.tar.gz --strip-components=1 \ && sed -i '/jetty-logging/d' etc/jetty.conf \ && rm jetty.tar.gz* \ diff --git a/9.4-jre8/alpine/Dockerfile b/9.4-jre8/alpine/Dockerfile index 1cab108..463656b 100644 --- a/9.4-jre8/alpine/Dockerfile +++ b/9.4-jre8/alpine/Dockerfile @@ -40,7 +40,7 @@ RUN set -xe \ && for key in $JETTY_GPG_KEYS; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \ && gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz \ - && rm -r "$GNUPGHOME" \ + && rm -rf "$GNUPGHOME" \ && tar -xvzf jetty.tar.gz \ && mv jetty-home-$JETTY_VERSION/* ./ \ && sed -i '/jetty-logging/d' etc/jetty.conf \