Merge "Remove stale images from openstack-helm-infra"
This commit is contained in:
Zuul
Gerrit Code Review
commit
3f0cda712b
@ -1,41 +0,0 @@
|
||||
FROM docker.io/ubuntu:xenial
|
||||
MAINTAINER pete.birley@att.com
|
||||
|
||||
ARG LIBVIRT_VERSION=ocata
|
||||
ARG CEPH_RELEASE=mimic
|
||||
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 \
|
||||
cgroup-tools \
|
||||
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,46 +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.24
|
||||
DISTRO ?= ubuntu
|
||||
DISTRO_RELEASE ?= xenial
|
||||
CEPH_RELEASE ?= mimic
|
||||
|
||||
DOCKER_REGISTRY ?= docker.io
|
||||
IMAGE_NAME ?= libvirt
|
||||
IMAGE_PREFIX ?= openstackhelm
|
||||
IMAGE_TAG ?= $(DISTRO)-$(DISTRO_RELEASE)-$(LIBVIRT_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.24
|
||||
DISTRO=ubuntu
|
||||
DISTRO_RELEASE=xenial
|
||||
CEPH_RELEASE=mimic
|
||||
|
||||
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}
|
||||
@ -1,22 +0,0 @@
|
||||
FROM docker.io/mariadb@sha256:d4cf9fbdf33a2940ca35c653bf2b702cbaed0bff87ade8c3e3ee9eab81b38b27
|
||||
#FROM docker.io/mariadb:10.2.18
|
||||
|
||||
RUN set -ex ;\
|
||||
apt-get update ;\
|
||||
apt-get upgrade -y ;\
|
||||
apt-get install -y --no-install-recommends \
|
||||
python-pip ;\
|
||||
pip --no-cache-dir install --upgrade pip==18.1 ;\
|
||||
hash -r ;\
|
||||
pip --no-cache-dir install --upgrade setuptools ;\
|
||||
pip --no-cache-dir install --upgrade \
|
||||
configparser \
|
||||
iso8601 \
|
||||
kubernetes ;\
|
||||
apt-get clean -y ;\
|
||||
rm -rf \
|
||||
/var/cache/debconf/* \
|
||||
/var/lib/apt/lists/* \
|
||||
/var/log/* \
|
||||
/tmp/* \
|
||||
/var/tmp/*
|
||||
@ -1,41 +0,0 @@
|
||||
MariaDB Container
|
||||
=================
|
||||
|
||||
This container builds an image with MariaDB 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 MariaDB 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
|
||||
|
||||
sudo docker build \
|
||||
--network=host \
|
||||
--force-rm \
|
||||
--pull \
|
||||
--no-cache \
|
||||
--file=./tools/images/mariadb/Dockerfile \
|
||||
-t docker.io/openstackhelm/mariadb:10.2.18 \
|
||||
tools/images/mariadb
|
||||
sudo docker push docker.io/openstackhelm/mariadb:10.2.18
|
||||
@ -1,43 +0,0 @@
|
||||
FROM centos:7
|
||||
MAINTAINER pete.birley@att.com
|
||||
|
||||
ARG PROJECT=nova
|
||||
ARG UID=42424
|
||||
ARG GID=42424
|
||||
|
||||
RUN set -ex ;\
|
||||
yum -y upgrade ;\
|
||||
yum -y install \
|
||||
epel-release \
|
||||
centos-release-openstack-newton \
|
||||
centos-release-qemu-ev ;\
|
||||
yum -y install \
|
||||
ceph-common \
|
||||
git \
|
||||
libcgroup-tools \
|
||||
libguestfs \
|
||||
libvirt \
|
||||
libvirt-daemon \
|
||||
libvirt-daemon-config-nwfilter \
|
||||
libvirt-daemon-driver-lxc \
|
||||
libvirt-daemon-driver-nwfilter \
|
||||
libvirt-devel \
|
||||
openvswitch \
|
||||
python-devel \
|
||||
qemu-kvm ;\
|
||||
yum -y group install \
|
||||
"Development Tools" ;\
|
||||
yum clean all ;\
|
||||
rm -rf /var/cache/yum ;\
|
||||
curl https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py ;\
|
||||
python /tmp/get-pip.py ;\
|
||||
rm -f /tmp/get-pip.py ;\
|
||||
TMP_DIR=$(mktemp -d) ;\
|
||||
git clone https://github.com/openstack/virtualbmc ${TMP_DIR} ;\
|
||||
pip install -U ${TMP_DIR} ;\
|
||||
rm -rf ${TMP_DIR} ;\
|
||||
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 qemu ${PROJECT}
|
||||
@ -1,36 +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
|
||||
|
||||
DOCKER_REGISTRY ?= docker.io
|
||||
IMAGE_NAME ?= vbmc
|
||||
IMAGE_PREFIX ?= openstackhelm
|
||||
IMAGE_TAG ?= centos-0.1
|
||||
LABEL ?= putlabelshere
|
||||
|
||||
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
|
||||
|
||||
# Build vbmc 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 \
|
||||
--label $(LABEL) \
|
||||
-t $(IMAGE) \
|
||||
.
|
||||
@ -1,38 +0,0 @@
|
||||
VBMC Container
|
||||
==============
|
||||
|
||||
This container builds a small image with kubectl and some other utilities for
|
||||
use in both the ironic checks and development.
|
||||
|
||||
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 VBMC Image environment
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
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
|
||||
|
||||
sudo docker build \
|
||||
--network=host \
|
||||
-t docker.io/openstackhelm/vbmc:centos-0.1 \
|
||||
tools/images/vbmc
|
||||
sudo docker push docker.io/openstackhelm/vbmc:centos-0.1
|
||||
Loading…
x
Reference in New Issue
Block a user