diff options
| author | Clark Boylan <clark.boylan@gmail.com> | 2021-08-23 14:20:51 -0700 |
|---|---|---|
| committer | Clark Boylan <clark.boylan@gmail.com> | 2021-08-23 14:56:17 -0700 |
| commit | 930ac1114b9d2c91c2d6c277202a80b729ff9903 (patch) | |
| tree | 3edd4797b266c340a8f8f70eeaed2e389859b208 /Dockerfile-py3 | |
| parent | f190ba2b7d02693ee2d7b59043b0baf9fddd203b (diff) | |
| download | swift-930ac1114b9d2c91c2d6c277202a80b729ff9903.tar.gz | |
Fix docker image builds
The image builds are trying to fetch a gpg pubkey from keybase which
does not exist. This causes the builds to fail. Fix this by vendoring
the key in the swift repo directly. This should be more reliable.
Upstream bug at https://github.com/just-containers/s6-overlay/issues/352
Note I looked up the pubkey given the hash on that issue and copied its
contents into this change. I can't vouch for the validity of this key
beyond that. However, if it is listed in that issue and validates the
packages from s6 then it is probably good.
Change-Id: I3f42fbaae5f246836024f95b549b487b41bd6f1d
Diffstat (limited to 'Dockerfile-py3')
| -rw-r--r-- | Dockerfile-py3 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Dockerfile-py3 b/Dockerfile-py3 index 89ee92d2a..fd4185365 100644 --- a/Dockerfile-py3 +++ b/Dockerfile-py3 @@ -46,7 +46,7 @@ RUN mkdir /etc/swift && \ echo && \ echo && \ echo "================ installing s6-overlay ===================" && \ - curl https://keybase.io/justcontainers/key.asc | gpg --import && \ + gpg --import /opt/swift/docker/s6-gpg-pub-key && \ gpg --verify /tmp/s6-overlay-$ARCH.tar.gz.sig /tmp/s6-overlay-$ARCH.tar.gz && \ gunzip -c /tmp/s6-overlay-$ARCH.tar.gz | tar -xf - -C / && \ gunzip -c /tmp/socklog-overlay-amd64.tar.gz | tar -xf - -C / && \ |