Merge "Libvirt: Remove libvirt dockerfile from repo"
This commit is contained in:
Zuul
Gerrit Code Review
commit
a82fdd2491
|
|
@ -1,40 +0,0 @@
|
|||
FROM docker.io/ubuntu:xenial
|
||||
MAINTAINER pete.birley@att.com
|
||||
|
||||
ARG LIBVIRT_VERSION=1.3.1-1ubuntu10.19
|
||||
ARG CEPH_RELEASE=luminous
|
||||
ARG PROJECT=nova
|
||||
ARG UID=42424
|
||||
ARG GID=42424
|
||||
|
||||
ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc
|
||||
RUN set -ex ;\
|
||||
export DEBIAN_FRONTEND=noninteractive ;\
|
||||
apt-key add /etc/apt/ceph-release.asc ;\
|
||||
rm -f /etc/apt/ceph-release.asc ;\
|
||||
echo deb http://download.ceph.com/debian-${CEPH_RELEASE}/ xenial main | tee /etc/apt/sources.list.d/ceph.list ;\
|
||||
apt-get update ;\
|
||||
apt-get upgrade -y ;\
|
||||
apt-get install --no-install-recommends -y \
|
||||
ceph-common \
|
||||
dmidecode \
|
||||
ebtables \
|
||||
iproute2 \
|
||||
libvirt-bin=${LIBVIRT_VERSION} \
|
||||
pm-utils \
|
||||
qemu \
|
||||
qemu-block-extra \
|
||||
qemu-efi \
|
||||
openvswitch-switch ;\
|
||||
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} ;\
|
||||
apt-get clean -y ;\
|
||||
rm -rf \
|
||||
/var/cache/debconf/* \
|
||||
/var/lib/apt/lists/* \
|
||||
/var/log/* \
|
||||
/tmp/* \
|
||||
/var/tmp/*
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
# Copyright 2017 The Openstack-Helm Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# It's necessary to set this because some environments don't link sh -> bash.
|
||||
SHELL := /bin/bash
|
||||
|
||||
LIBVIRT_VERSION ?= 1.3.1-1ubuntu10.19
|
||||
LIBVIRT_MJR_VERSION = $(subst -, ,$(LIBVIRT_VERSION))
|
||||
DISTRO ?= ubuntu
|
||||
DISTRO_RELEASE ?= xenial
|
||||
CEPH_RELEASE ?= luminous
|
||||
|
||||
DOCKER_REGISTRY ?= docker.io
|
||||
IMAGE_NAME ?= libvirt
|
||||
IMAGE_PREFIX ?= openstackhelm
|
||||
IMAGE_TAG ?= $(DISTRO)-$(DISTRO_RELEASE)-$(word 1, $(LIBVIRT_MJR_VERSION))
|
||||
LABEL ?= putlabelshere
|
||||
|
||||
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
|
||||
|
||||
# Build libvirt Docker image for this project
|
||||
.PHONY: images
|
||||
images: build_$(IMAGE_NAME)
|
||||
|
||||
# Make targets intended for use by the primary targets above.
|
||||
.PHONY: build_$(IMAGE_NAME)
|
||||
build_$(IMAGE_NAME):
|
||||
docker build \
|
||||
--network=host \
|
||||
--force-rm \
|
||||
--file=./Dockerfile.${DISTRO}.xenial \
|
||||
--build-arg LIBVIRT_VERSION="${LIBVIRT_VERSION}" \
|
||||
--build-arg CEPH_RELEASE="${CEPH_RELEASE}" \
|
||||
--label $(LABEL) \
|
||||
-t $(IMAGE) \
|
||||
.
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
Libvirt Container
|
||||
=================
|
||||
|
||||
This container builds a small image with Libvirt for use with OpenStack-Helm.
|
||||
|
||||
Instructions
|
||||
------------
|
||||
|
||||
OS Specific Host setup:
|
||||
~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Ubuntu:
|
||||
^^^^^^^
|
||||
|
||||
From a freshly provisioned Ubuntu 16.04 LTS host run:
|
||||
|
||||
.. code:: bash
|
||||
|
||||
sudo apt-get update -y
|
||||
sudo apt-get install -y \
|
||||
docker.io \
|
||||
git
|
||||
|
||||
Build the Libvirt Image
|
||||
~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
A known good image is published to dockerhub on a fairly regular basis, but if
|
||||
you wish to build your own image, from the root directory of the OpenStack-Helm
|
||||
repo run:
|
||||
|
||||
.. code:: bash
|
||||
|
||||
LIBVIRT_VERSION=1.3.1-1ubuntu10.19
|
||||
DISTRO=ubuntu
|
||||
DISTRO_RELEASE=xenial
|
||||
CEPH_RELEASE=luminous
|
||||
|
||||
sudo docker build \
|
||||
--network=host \
|
||||
--force-rm \
|
||||
--pull \
|
||||
--no-cache \
|
||||
--file=./tools/images/libvirt/Dockerfile.${DISTRO}.xenial \
|
||||
--build-arg LIBVIRT_VERSION="${LIBVIRT_VERSION}" \
|
||||
--build-arg CEPH_RELEASE="${CEPH_RELEASE}" \
|
||||
-t docker.io/openstackhelm/libvirt:${DISTRO}-${DISTRO_RELEASE}-${LIBVIRT_VERSION%-*} \
|
||||
tools/images/libvirt
|
||||
sudo docker push docker.io/openstackhelm/libvirt:${DISTRO}-${DISTRO_RELEASE}-${LIBVIRT_VERSION%-*}
|
||||
|
|
@ -50,7 +50,6 @@ images:
|
|||
ks_endpoints: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3'
|
||||
ks_service: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3'
|
||||
ks_user: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3'
|
||||
libvirt: 'docker.io/kolla/ubuntu-source-nova-libvirt:3.0.3'
|
||||
magnum_api: 'docker.io/kolla/ubuntu-source-magnum-api:3.0.3'
|
||||
magnum_conductor: 'docker.io/kolla/ubuntu-source-magnum-conductor:3.0.3'
|
||||
magnum_db_sync: 'docker.io/kolla/ubuntu-source-magnum-api:3.0.3'
|
||||
|
|
|
|||
Loading…
Reference in New Issue