diff options
| author | James E. Blair <jim@acmegating.com> | 2021-10-27 14:15:11 -0700 |
|---|---|---|
| committer | James E. Blair <jim@acmegating.com> | 2021-10-27 14:39:45 -0700 |
| commit | b269e9e255cef739405dbfb756e62f41444edd8f (patch) | |
| tree | 878e94cfb10a9519cb1d357400a15321dc8191ad | |
| parent | 69f93b6c7545e08b7caa66934c93d1b1be8efa8c (diff) | |
| download | zuul-b269e9e255cef739405dbfb756e62f41444edd8f.tar.gz | |
Rely on bullseye image for skopeo in container image
Debian bullseye includes skopeo, so we can drop the kubic repository
(which as I write this is having synchronization errors) in favor of
just using the version from the underlying OS.
Change-Id: Ifde147c8c690dd6a421b0133dbabcff7dd9b9649
| -rw-r--r-- | Dockerfile | 5 | ||||
| -rw-r--r-- | tools/4D64390375060AA4.asc | 21 |
2 files changed, 1 insertions, 25 deletions
diff --git a/Dockerfile b/Dockerfile index b670c6f54..16bde64d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,10 +69,7 @@ COPY --from=builder /usr/local/lib/zuul/ /usr/local/lib/zuul COPY --from=builder /tmp/openshift-install/kubectl /usr/local/bin/kubectl COPY --from=builder /tmp/openshift-install/oc /usr/local/bin/oc -# https://podman.io/getting-started/installation.html -COPY tools/4D64390375060AA4.asc /etc/apt/trusted.gpg.d/kubic.asc -RUN echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_11/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list \ - && apt-get update \ +RUN apt-get update \ && apt-get install -y skopeo \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/tools/4D64390375060AA4.asc b/tools/4D64390375060AA4.asc deleted file mode 100644 index 704c04b47..000000000 --- a/tools/4D64390375060AA4.asc +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQENBFtkV0cBCADStSTCG5qgYtzmWfymHZqxxhfwfS6fdHJcbGUeXsI5dxjeCWhs -XarZm6rWZOd5WfSmpXhbKOyM6Ll+6bpSl5ICHLa6fcpizYWEPa8fpg9EGl0cF12G -GgVLnnOZ6NIbsoW0LHt2YN0jn8xKVwyPp7KLHB2paZh+KuURERG406GXY/DgCxUx -Ffgdelym/gfmt3DSq6GAQRRGHyucMvPYm53r+jVcKsf2Bp6E1XAfqBrD5r0maaCU -Wvd7bi0B2Q0hIX0rfDCBpl4rFqvyaMPgn+Bkl6IW37zCkWIXqf1E5eDm/XzP881s -+yAvi+JfDwt7AE+Hd2dSf273o3WUdYJGRwyZABEBAAG0OGRldmVsOmt1YmljIE9C -UyBQcm9qZWN0IDxkZXZlbDprdWJpY0BidWlsZC5vcGVuc3VzZS5vcmc+iQE+BBMB -CAAoBQJfcJJOAhsDBQkIKusHBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBN -ZDkDdQYKpB0xCACmtCT6ruPiQa4l0DEptZ+u3NNbZfSVGH4fE4hyTjLbzrCxqcoh -xJvDKxspuJ85wWFWMtl57+lFFE1KP0AX2XTT+/v2vN1PIfwgOSw3yp2sgWuIXFAi -89YSjSh8G0SGAH90A9YFMnTbllzGoGURjSX03iasW3A408ljbDehA6rpS3t3FD7P -PnUF6204orYu00Qvc54an/xVJzxupb69MKW5EeK7x8MJnIToT8hIdOdGVD6axsis -x+1U71oMK1gBke7p4QPUdhJFpSUd6kT8bcO+7rYouoljFNYkUfwnqtUn7525fkfg -uDqqXvOJMpJ/sK1ajHOeehp5T4Q45L/qUCb3iEYEExECAAYFAltkV0cACgkQOzAR -t2udZSOoswCdF44NTN09DwhPFbNYhEMb9juP5ykAn0bcELvuKmgDwEwZMrPQkG8t -Pu9n -=42uC ------END PGP PUBLIC KEY BLOCK----- |