Use bullseye podman in container
After updating images to bullseye (I21cfbd3935e48be4b92591ea36c7eed301230753) we can use the native podman packages. These are slightly older, but should be fine for the intended usages. Change-Id: Ica62392ebf4a665a04cd65458dda9e0a7545ccc8
This commit is contained in:
parent
f5d015c883
commit
cce7dbc669
12
Dockerfile
12
Dockerfile
|
@ -69,7 +69,6 @@ RUN echo "nodepool ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/nodepool-sudo \
|
|||
# are incoporated into the openstack-ci-core version
|
||||
|
||||
COPY tools/openstack-ci-core-ppa.asc /etc/apt/trusted.gpg.d/
|
||||
COPY tools/kubic.asc /etc/apt/trusted.gpg.d/
|
||||
|
||||
RUN \
|
||||
echo "deb http://ppa.launchpad.net/openstack-ci-core/vhd-util/ubuntu focal main" >> /etc/apt/sources.list \
|
||||
|
@ -92,19 +91,14 @@ RUN \
|
|||
|
||||
# Podman install mainly for the "containerfile" elements of dib that
|
||||
# build images from extracts of upstream containers.
|
||||
# --install-recommends is important for getting
|
||||
# containernetwork-plugins and other packages. Current podman
|
||||
# requires a later libseccomp2 only provided by backports.
|
||||
# --install-recommends is important for getting some reccommends like
|
||||
# slirp4netns and uidmap that help with non-root usage.
|
||||
#
|
||||
# Podman defaults to trying to use systemd to do cgroup things (insert
|
||||
# hand-wavy motion) but it's not in the container; override to use
|
||||
# cgroupfs manager. Also disable trying to send logs to the journal.
|
||||
#
|
||||
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 \
|
||||
&& apt-get install -y --install-recommends \
|
||||
podman \
|
||||
RUN apt-get install -y --install-recommends podman \
|
||||
&& printf '[engine]\ncgroup_manager="cgroupfs"\nevents_logger="file"\n' > /etc/containers/containers.conf
|
||||
|
||||
# There is a Debian package in the NEW queue currently for dnf-plugins-core
|
||||
|
|
|
@ -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-----
|
Loading…
Reference in New Issue