Libvirt: Add Bullseye and remove SUSE dockerfiles
This change adds a dockerfile for debian bullseye to build a libvirt image. Currently ceph does not have a release file for ubuntu jammy. Also removed the libvirt dockerfiles for SUSE since they have not been maintained. Change-Id: I87152fbf743ba444c72d0b65245e194bd9faa9b0
This commit is contained in:
parent
fb2dfcd1c9
commit
f30a6377bd
|
@ -0,0 +1,24 @@
|
|||
ARG FROM=docker.io/debian:bullseye
|
||||
FROM ${FROM}
|
||||
|
||||
ARG UBUNTU_RELEASE=bullseye
|
||||
ARG CEPH_RELEASE=quincy
|
||||
ARG CEPH_RELEASE_TAG=""
|
||||
ARG PROJECT=nova
|
||||
ARG UID=42424
|
||||
ARG GID=42424
|
||||
|
||||
ARG CEPH_REPO=http://download.ceph.com/debian-${CEPH_RELEASE}/
|
||||
ARG CEPH_KEY=http://download.ceph.com/keys/release.asc
|
||||
|
||||
ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
|
||||
COPY ./ubuntu-install-libvirt.sh /tmp/ubuntu-install-libvirt.sh
|
||||
RUN set -ex ;\
|
||||
export DEBIAN_FRONTEND=noninteractive ;\
|
||||
apt-get update ;\
|
||||
apt-get install --no-install-recommends -y \
|
||||
apt-transport-https \
|
||||
ca-certificates \
|
||||
gnupg ;\
|
||||
/tmp/ubuntu-install-libvirt.sh ;\
|
||||
rm -rf /tmp/*
|
|
@ -1,41 +0,0 @@
|
|||
ARG FROM=opensuse/leap:15.1
|
||||
FROM ${FROM}
|
||||
|
||||
LABEL maintainer="containers@suse.com"
|
||||
|
||||
ARG PROJECT=nova
|
||||
ARG UID=42424
|
||||
ARG GID=42424
|
||||
|
||||
COPY suse_leap15_virtualization_repo.key /tmp/
|
||||
RUN rpm --import /tmp/suse_leap15_virtualization_repo.key
|
||||
|
||||
RUN set -ex ;\
|
||||
zypper -n install \
|
||||
ceph-common \
|
||||
systemd \
|
||||
dmidecode \
|
||||
ebtables \
|
||||
iproute2 \
|
||||
libvirt \
|
||||
python2-libvirt-python \
|
||||
qemu \
|
||||
qemu-block-rbd \
|
||||
qemu-kvm \
|
||||
openvswitch ;\
|
||||
zypper ar "http://download.opensuse.org/repositories/Virtualization/openSUSE_Leap_15.1" Virtualization;\
|
||||
zypper refresh ;\
|
||||
zypper -n install \
|
||||
libcgroup1 \
|
||||
libcgroup-tools; \
|
||||
zypper rr Virtualization; \
|
||||
groupadd -g ${GID} ${PROJECT} ;\
|
||||
useradd -u ${UID} -g ${PROJECT} -M -d /var/lib/${PROJECT} -s /usr/sbin/nologin -c "${PROJECT} user" ${PROJECT} ;\
|
||||
mkdir -p /etc/${PROJECT} /var/log/${PROJECT} /var/lib/${PROJECT} /var/cache/${PROJECT} ;\
|
||||
chown ${PROJECT}:${PROJECT} /etc/${PROJECT} /var/log/${PROJECT} /var/lib/${PROJECT} /var/cache/${PROJECT} ;\
|
||||
usermod -a -G kvm ${PROJECT} ;\
|
||||
zypper clean -a ;\
|
||||
rm -rf \
|
||||
/var/log/* \
|
||||
/tmp/* \
|
||||
/var/tmp/*
|
|
@ -1,21 +0,0 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v1
|
||||
|
||||
mQENBFImAl0BCACkjaXGvVLHBGTVXVP0khtpUVHqFvCRtaIIMHaX/5oTr3nyehDQ
|
||||
Ex9VLsSRcNa0QxtnCHFRQzjWWqe+i6pBginnSjucgmjnIKyJsF4l6R+rwAiinHQX
|
||||
C4s6Lqg/wH9xDPRBrMYFqlc/7MVf0Glhk1+lAxgQjolMt+5AbbrWlBbwc/i+++zl
|
||||
ES3MaeH8aiwup/ogjhmk0SbCQQ/ib21p3XWBwx2oz/KM6Voq9tKDvMczjzNRY3ZT
|
||||
6Di3FsUSKI7kgljiNiuN+675YwqEqxWEJgdE5a7Zb67giH1Ik08b5wQiF5jSAICD
|
||||
DxW7/ibWBvZJnqhqQT2xJpLC5VaJqwkN8o83ABEBAAG0PlZpcnR1YWxpemF0aW9u
|
||||
IE9CUyBQcm9qZWN0IDxWaXJ0dWFsaXphdGlvbkBidWlsZC5vcGVuc3VzZS5vcmc+
|
||||
iQE7BBMBAgAmBQJSJgJdAhsDBQkEHrAABgsJCAcDAgQVAggDBBYCAwECHgECF4AA
|
||||
CgkQoZP7tXIXT8ITnwf3SVUUoVjVLFCjhIxdet8BL011cJDwr9TwKEQfq4Ybsq5L
|
||||
5Y1/Zk86rTzrVOZrODLwNRIC3fMuegZV5f85KMggXu37Di+UvX+dQW9v1hte+hAT
|
||||
+gsqb60kOnE/Yacgkb6D3xIzRudAB2q/xfvHl/hgfn416yGI8NvntT7n4Hk9wT28
|
||||
9JSFkun0uaessg77aXlAdsqHwdugm9hELeva89OoYoiZ4d9r4ScTMSj0UkNgnh7g
|
||||
CyIScZHYqiiOeosUtAX9u1PyUFfFsg9s5snfud7aF48EfXU0RTtZAGKtG4GPDv3q
|
||||
bYc5TJ2pQzs9y5Bk/jAMR/QQw8CKglBsn1cjYkKViEYEExECAAYFAlImAl0ACgkQ
|
||||
OzARt2udZSO5yACgr6Ei7QZ+PAmg4Mr5db+4M3aepAEAniU33RaTKBCGkwQi6kHr
|
||||
4VaII2/E
|
||||
=l8DH
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
|
@ -1,27 +0,0 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v1
|
||||
|
||||
mQENBFNw2+sBCADLCX6vsKo5xwLmbpF5gGHogJJs6s7WM1LwsjJixTIbuD6LTXdj
|
||||
ZZKVCg23naK+n2uQhLmDiVT/BafHhtHEXKHObBxqVDWqrroMQZrC+OvMjzuu0RFI
|
||||
0esbUvZtDvhMwe2q1CJZcMIiofwBTTGAcxlYlVbtdMORGvIy6816KNvc0VHzrpU3
|
||||
8ITeZ+u0PFRrME0vSZAIf5pkzDI1gZ+sn3XKIt0+mHUuvjA88HC3NT6B0Ojqky7U
|
||||
eDevpr+mntSzdU5zrnfZQ0SxY53aHpgWGcZCD5PtxSWHnBPHwMXIU+LtZVqiJWi9
|
||||
YfYAhvhRTbBUY1Yhm3lBQPPGdCz3giSMYymFABEBAAG0OGZpbGVzeXN0ZW1zIE9C
|
||||
UyBQcm9qZWN0IDxmaWxlc3lzdGVtc0BidWlsZC5vcGVuc3VzZS5vcmc+iEYEExEC
|
||||
AAYFAlNw2+sACgkQOzARt2udZSMieACeLFcdDY3LOdfU0IItek4rbmo22pcAoJ6m
|
||||
ZgznQVfbWfEyvTkkceBGKNXkiQE+BBMBAgAoBQJTcNvrAhsDBQkEHrAABgsJCAcD
|
||||
AgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCYyX/nMk5jEQfoB/99X0De5hVdzi6tn8YC
|
||||
pc7/huoFZa3a8MzSOQkyj5CouGtwSZiWp8JtE4pnyXKk2eH3+kO56qtZdfRDghBS
|
||||
7JHD/RA8qWQEeOEUVez9enwpbcnDUwj6ON+pxNNsp472gPnWYzGdx5FJFzOcqVG7
|
||||
3W5AfeKbU5zrPjEvaa9t2IElVaqnw6MD4rKSYqfnz8wDz+r1u7kJgG/Fb01Ai9lW
|
||||
L1sE2OvlikHpuJ2FdEpDpt7zC5b9H8M5Je0VjlJldHFBkVC1z8xuI9x9jCSZbePs
|
||||
OWjSVY6rbkitmyBOCW0U9IDKaeZIWQAKrmTAw0nEHRLFKoO6uuqSSOLmD5GBUB0i
|
||||
J53eiQE+BBMBAgAoBQJXjjr6AhsDBQkIPA8PBgsJCAcDAgYVCAIJCgsEFgIDAQIe
|
||||
AQIXgAAKCRCYyX/nMk5jEdRlB/49tVO9oAdKarpZiCPDD/ygR1JMg0eB9xIhEvm3
|
||||
Qgaoqlfgp0BV2nALnLv9/2/2zPtwCRlUJ0UsVrfBhbEiKRm7mvt/MLrA8Q/qsOul
|
||||
T63MHOorepSb6MBOk4h78OO8BeIS98sd12/GO+0hJk4fw9Istw/W+5SDS0CzQJtc
|
||||
MhINf0YukO2exZRdxcQfG4x8837ospet2JXNJT1bNO+y57mc1mAL7TG7e1tugPKI
|
||||
kfPMkFL3rBpOnW3Xd8e2AsqYamdg5wTCWAo1adgFpUJz+fmIeRA64hmpVth5ZMD5
|
||||
Wqa1AJHizR8bh1oJW+vlUSAh42d7KYcpyEgqOMRiLM6mmlEF
|
||||
=LAmm
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
|
@ -39,12 +39,6 @@
|
|||
vars: &libvirt_vars
|
||||
currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}"
|
||||
docker_images:
|
||||
#- context: libvirt
|
||||
# repository: openstackhelm/libvirt
|
||||
# tags:
|
||||
# - latest-opensuse_15
|
||||
# - "opensuse_15-{{ currentdate }}"
|
||||
# dockerfile: Dockerfile.suse_15
|
||||
- context: libvirt
|
||||
repository: openstackhelm/libvirt
|
||||
dockerfile: Dockerfile.centos_7
|
||||
|
@ -67,6 +61,12 @@
|
|||
tags:
|
||||
- latest-ubuntu_focal
|
||||
- "ubuntu_focal-{{ currentdate }}"
|
||||
- context: libvirt
|
||||
repository: openstackhelm/libvirt
|
||||
dockerfile: Dockerfile.debian_bullseye
|
||||
tags:
|
||||
- latest-debian_bullseye
|
||||
- "debian_bullseye-{{ currentdate }}"
|
||||
files: &libvirt_files
|
||||
- libvirt/.*
|
||||
- zuul.d/libvirt.yaml
|
||||
|
|
Loading…
Reference in New Issue