Skip to content

Commit

Permalink
attempt fix for build failures
Browse files Browse the repository at this point in the history 
Signed-off-by: Lachlan Roberts <[email protected]>
  • Loading branch information
@lachlan-roberts
lachlan-roberts committed Dec 11, 2023
1 parent 4558a73 commit 0eb91dd
Show file tree
Hide file tree
Showing 98 changed files with 122 additions and 135 deletions.
2 changes: 1 addition & 1 deletion amazoncorretto/10.0/jdk11-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
1 change: 0 additions & 1 deletion amazoncorretto/10.0/jdk11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ RUN set -xe ; \
# 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 ; \
#
Expand Down
2 changes: 1 addition & 1 deletion amazoncorretto/10.0/jdk17-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
1 change: 0 additions & 1 deletion amazoncorretto/10.0/jdk17/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ RUN set -xe ; \
# 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 ; \
#
Expand Down
2 changes: 1 addition & 1 deletion amazoncorretto/10.0/jdk21-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
1 change: 0 additions & 1 deletion amazoncorretto/10.0/jdk21/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ RUN set -xe ; \
# 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 ; \
#
Expand Down
2 changes: 1 addition & 1 deletion amazoncorretto/11.0/jdk11-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
1 change: 0 additions & 1 deletion amazoncorretto/11.0/jdk11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ RUN set -xe ; \
# 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 ; \
#
Expand Down
2 changes: 1 addition & 1 deletion amazoncorretto/11.0/jdk17-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
1 change: 0 additions & 1 deletion amazoncorretto/11.0/jdk17/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ RUN set -xe ; \
# 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 ; \
#
Expand Down
2 changes: 1 addition & 1 deletion amazoncorretto/11.0/jdk21-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
1 change: 0 additions & 1 deletion amazoncorretto/11.0/jdk21/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ RUN set -xe ; \
# 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 ; \
#
Expand Down
2 changes: 1 addition & 1 deletion amazoncorretto/12.0/jdk17-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
1 change: 0 additions & 1 deletion amazoncorretto/12.0/jdk17/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ RUN set -xe ; \
# 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 ; \
#
Expand Down
2 changes: 1 addition & 1 deletion amazoncorretto/12.0/jdk21-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
1 change: 0 additions & 1 deletion amazoncorretto/12.0/jdk21/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ RUN set -xe ; \
# 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 ; \
#
Expand Down
2 changes: 1 addition & 1 deletion amazoncorretto/9.4/jdk11-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
1 change: 0 additions & 1 deletion amazoncorretto/9.4/jdk11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ RUN set -xe ; \
# 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 ; \
#
Expand Down
2 changes: 1 addition & 1 deletion amazoncorretto/9.4/jdk17-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
1 change: 0 additions & 1 deletion amazoncorretto/9.4/jdk17/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ RUN set -xe ; \
# 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 ; \
#
Expand Down
2 changes: 1 addition & 1 deletion amazoncorretto/9.4/jdk21-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
1 change: 0 additions & 1 deletion amazoncorretto/9.4/jdk21/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ RUN set -xe ; \
# 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 ; \
#
Expand Down
2 changes: 1 addition & 1 deletion amazoncorretto/9.4/jdk8-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
1 change: 0 additions & 1 deletion amazoncorretto/9.4/jdk8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ RUN set -xe ; \
# 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 ; \
#
Expand Down
2 changes: 1 addition & 1 deletion azul/zulu-openjdk-alpine/10.0/jdk11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
2 changes: 1 addition & 1 deletion azul/zulu-openjdk-alpine/10.0/jdk17/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
2 changes: 1 addition & 1 deletion azul/zulu-openjdk-alpine/10.0/jdk21/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
2 changes: 1 addition & 1 deletion azul/zulu-openjdk-alpine/11.0/jdk11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
2 changes: 1 addition & 1 deletion azul/zulu-openjdk-alpine/11.0/jdk17/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
2 changes: 1 addition & 1 deletion azul/zulu-openjdk-alpine/11.0/jdk21/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
2 changes: 1 addition & 1 deletion azul/zulu-openjdk-alpine/12.0/jdk17/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
2 changes: 1 addition & 1 deletion azul/zulu-openjdk-alpine/12.0/jdk21/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
2 changes: 1 addition & 1 deletion azul/zulu-openjdk-alpine/9.4/jdk11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
2 changes: 1 addition & 1 deletion azul/zulu-openjdk-alpine/9.4/jdk17/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
2 changes: 1 addition & 1 deletion azul/zulu-openjdk-alpine/9.4/jdk21/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
2 changes: 1 addition & 1 deletion azul/zulu-openjdk-alpine/9.4/jdk8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -xe ; \
mkdir -p $TMPDIR ; \
#
# Install utils needed to verify keys
apk add --no-cache gnupg curl ; \
apk add --no-cache gnupg2 curl ; \
#
# fetch GPG keys
export GNUPGHOME=/jetty-keys ; \
Expand Down
4 changes: 2 additions & 2 deletions azul/zulu-openjdk/10.0/jdk11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN set -xe ; \
apt-get install -y --no-install-recommends \
ca-certificates \
p11-kit \
gnupg \
gnupg2 \
curl \
; \
#
Expand Down Expand Up @@ -74,6 +74,7 @@ RUN set -xe ; \
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 ; \
Expand All @@ -84,7 +85,6 @@ RUN set -xe ; \
# 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 ; \
#
Expand Down
4 changes: 2 additions & 2 deletions azul/zulu-openjdk/10.0/jdk17/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN set -xe ; \
apt-get install -y --no-install-recommends \
ca-certificates \
p11-kit \
gnupg \
gnupg2 \
curl \
; \
#
Expand Down Expand Up @@ -74,6 +74,7 @@ RUN set -xe ; \
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 ; \
Expand All @@ -84,7 +85,6 @@ RUN set -xe ; \
# 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 ; \
#
Expand Down
4 changes: 2 additions & 2 deletions azul/zulu-openjdk/10.0/jdk21/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN set -xe ; \
apt-get install -y --no-install-recommends \
ca-certificates \
p11-kit \
gnupg \
gnupg2 \
curl \
; \
#
Expand Down Expand Up @@ -74,6 +74,7 @@ RUN set -xe ; \
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 ; \
Expand All @@ -84,7 +85,6 @@ RUN set -xe ; \
# 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 ; \
#
Expand Down
Loading

0 comments on commit 0eb91dd

Please sign in to comment.