From b269e9e255cef739405dbfb756e62f41444edd8f Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Wed, 27 Oct 2021 14:15:11 -0700
Subject: 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
---
 Dockerfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'Dockerfile')

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/*
-- 
cgit v1.2.1