diff --git a/3/debian11/3.11/Dockerfile b/3/debian11/3.11/Dockerfile index 9f1be3a..928de5d 100644 --- a/3/debian11/3.11/Dockerfile +++ b/3/debian11/3.11/Dockerfile @@ -1,7 +1,7 @@ FROM marketplace.gcr.io/google/c2d-debian11 # grab gosu for easy step-down from root -ENV GOSU_VERSION 1.16 +ENV GOSU_VERSION RUN set -x \ && apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ @@ -28,7 +28,7 @@ RUN set -x \ hkp://p80.pool.sks-keyservers.net:80 \ hkp://keyserver.ubuntu.com:80 \ ; do \ - gpg --no-tty --keyserver $server --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + gpg --no-tty --keyserver $server --recv-keys \ && found="yes" && break; \ done; test -n "$found" \ && gpg --no-tty --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ diff --git a/3/debian11/3.12/Dockerfile b/3/debian11/3.12/Dockerfile index 8132d38..729fb9e 100644 --- a/3/debian11/3.12/Dockerfile +++ b/3/debian11/3.12/Dockerfile @@ -1,7 +1,7 @@ FROM marketplace.gcr.io/google/c2d-debian11 # grab gosu for easy step-down from root -ENV GOSU_VERSION 1.16 +ENV GOSU_VERSION RUN set -x \ && apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ @@ -28,7 +28,7 @@ RUN set -x \ hkp://p80.pool.sks-keyservers.net:80 \ hkp://keyserver.ubuntu.com:80 \ ; do \ - gpg --no-tty --keyserver $server --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + gpg --no-tty --keyserver $server --recv-keys \ && found="yes" && break; \ done; test -n "$found" \ && gpg --no-tty --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ diff --git a/versions.yaml b/versions.yaml index 81b3e26..36919c1 100644 --- a/versions.yaml +++ b/versions.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Permission is hereby granted, free of charge, to any person obtaining a copy of # this software and associated documentation files (the "Software"), to deal in @@ -24,9 +24,6 @@ versions: - dir: 3/debian11/3.12 from: marketplace.gcr.io/google/c2d-debian11 packages: - gosu: - gpg: B42F6819007F00F88E364FD4036A9C25BF357DD4 - version: '1.16' otp: version: 25.1.2 rabbitmq: @@ -43,9 +40,6 @@ versions: - dir: 3/debian11/3.11 from: marketplace.gcr.io/google/c2d-debian11 packages: - gosu: - gpg: B42F6819007F00F88E364FD4036A9C25BF357DD4 - version: '1.16' otp: version: 25.1.2 rabbitmq: