openstack/openstack-helm
Code Issues Proposed changes

Merge "Libvirt: Update ubuntu package version"

Browse Source
This commit is contained in:
Zuul 2018-03-19 23:46:35 +00:00 committed by Gerrit Code Review
commit 73d3188ae6
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/images/libvirt/Dockerfile.ubuntu.xenial
View File

@ -1,7 +1,7 @@
FROM docker.io/ubuntu:xenial FROM docker.io/ubuntu:xenial
MAINTAINER pete.birley@att.com MAINTAINER pete.birley@att.com
ARG LIBVIRT_VERSION=1.3.1-1ubuntu10.18 ARG LIBVIRT_VERSION=1.3.1-1ubuntu10.19
ARG CEPH_RELEASE=luminous ARG CEPH_RELEASE=luminous
ARG PROJECT=nova ARG PROJECT=nova
ARG UID=42424 ARG UID=42424

7
tools/images/libvirt/Makefile
View File

@ -15,7 +15,8 @@
# It's necessary to set this because some environments don't link sh -> bash. # It's necessary to set this because some environments don't link sh -> bash.
SHELL := /bin/bash SHELL := /bin/bash
LIBVIRT_VERSION ?= 1.3.1-1ubuntu10.18 LIBVIRT_VERSION ?= 1.3.1-1ubuntu10.19
LIBVIRT_MJR_VERSION = $(subst -, ,$(LIBVIRT_VERSION))
DISTRO ?= ubuntu DISTRO ?= ubuntu
DISTRO_RELEASE ?= xenial DISTRO_RELEASE ?= xenial
CEPH_RELEASE ?= luminous CEPH_RELEASE ?= luminous
@ -23,7 +24,7 @@ CEPH_RELEASE ?= luminous
DOCKER_REGISTRY ?= docker.io DOCKER_REGISTRY ?= docker.io
IMAGE_NAME ?= libvirt IMAGE_NAME ?= libvirt
IMAGE_PREFIX ?= openstackhelm IMAGE_PREFIX ?= openstackhelm
IMAGE_TAG ?= ${DISTRO}-${DISTRO_RELEASE}-${LIBVIRT_VERSION%-*} IMAGE_TAG ?= $(DISTRO)-$(DISTRO_RELEASE)-$(word 1, $(LIBVIRT_MJR_VERSION))
LABEL ?= putlabelshere LABEL ?= putlabelshere
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
@ -38,8 +39,6 @@ build_$(IMAGE_NAME):
docker build \ docker build \
--network=host \ --network=host \
--force-rm \ --force-rm \
--pull \
--no-cache \
--file=./Dockerfile.${DISTRO}.xenial \ --file=./Dockerfile.${DISTRO}.xenial \
--build-arg LIBVIRT_VERSION="${LIBVIRT_VERSION}" \ --build-arg LIBVIRT_VERSION="${LIBVIRT_VERSION}" \
--build-arg CEPH_RELEASE="${CEPH_RELEASE}" \ --build-arg CEPH_RELEASE="${CEPH_RELEASE}" \

2
tools/images/libvirt/README.rst
View File

@ -30,7 +30,7 @@ repo run:
.. code:: bash .. code:: bash
LIBVIRT_VERSION=1.3.1-1ubuntu10.18 LIBVIRT_VERSION=1.3.1-1ubuntu10.19
DISTRO=ubuntu DISTRO=ubuntu
DISTRO_RELEASE=xenial DISTRO_RELEASE=xenial
CEPH_RELEASE=luminous CEPH_RELEASE=luminous