From 012eaa7fa145a7845537a68867de4f4368b83971 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 29 Apr 2020 10:09:06 -0500 Subject: [PATCH] Install skopeo in container images The container roles in zuul jobs use skopeo to copy to and from the intermediate registry. It is therefore helpful to have skopeo in the images. Change-Id: I1550b2eeca6cb1755976dd884e668bddf960f296 --- Dockerfile | 9 +++++++++ tools/2472D6D0.asc | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 tools/2472D6D0.asc diff --git a/Dockerfile b/Dockerfile index 78b68512bf..45419c6c88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,6 +55,15 @@ 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/2472D6D0.asc /etc/apt/trusted.gpg.d/kubic.asc +RUN echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list \ + && apt-get update \ + && apt-get install -y \ + skopeo \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + CMD ["/usr/local/bin/zuul-executor", "-f"] FROM zuul as zuul-fingergw diff --git a/tools/2472D6D0.asc b/tools/2472D6D0.asc new file mode 100644 index 0000000000..42f48ae4d1 --- /dev/null +++ b/tools/2472D6D0.asc @@ -0,0 +1,21 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.15 (GNU/Linux) + +mQENBFtkV0cBCADStSTCG5qgYtzmWfymHZqxxhfwfS6fdHJcbGUeXsI5dxjeCWhs +XarZm6rWZOd5WfSmpXhbKOyM6Ll+6bpSl5ICHLa6fcpizYWEPa8fpg9EGl0cF12G +GgVLnnOZ6NIbsoW0LHt2YN0jn8xKVwyPp7KLHB2paZh+KuURERG406GXY/DgCxUx +Ffgdelym/gfmt3DSq6GAQRRGHyucMvPYm53r+jVcKsf2Bp6E1XAfqBrD5r0maaCU +Wvd7bi0B2Q0hIX0rfDCBpl4rFqvyaMPgn+Bkl6IW37zCkWIXqf1E5eDm/XzP881s ++yAvi+JfDwt7AE+Hd2dSf273o3WUdYJGRwyZABEBAAG0OGRldmVsOmt1YmljIE9C +UyBQcm9qZWN0IDxkZXZlbDprdWJpY0BidWlsZC5vcGVuc3VzZS5vcmc+iQE+BBMB +CAAoBQJbZFdHAhsDBQkEHrAABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBN +ZDkDdQYKpL0BCACEuegX4bxPkdnML70BbvBmDazyuWYZtSAOLoTosVwXBlTeAIoY +xAw2Sdc895808blU964fuu8IDcR5KuvkTGSGIDBJ6fHZSFD8r68WSS0k1gOY7bUW +8kkeThlvuMATgULJIYGQ3vYrEhn5e+Pe8fb3AJmQpQWzcjtPX+pk66sVUT6iNaSt +QtBVGNTQvVDHekF1j/mYmVbIjIWL6whYkdtlu7KYzCx6KhY9u7i3THxY5ICsq64b +rYcy5FHaVv5SHfTvtu1WtiSlACVfOgPGntpI+Xi4P2F4n4c5I5VKBxpHteW4LGz8 +YOISzS7ZZlbZ7qus353OU0v6UbA660ju5/gGiEYEExECAAYFAltkV0cACgkQOzAR +t2udZSOoswCdF44NTN09DwhPFbNYhEMb9juP5ykAn0bcELvuKmgDwEwZMrPQkG8t +Pu9n +=CNmf +-----END PGP PUBLIC KEY BLOCK-----