Skip to content
Snippets Groups Projects
Commit f895ee07 authored by Steven Dake's avatar Steven Dake
Browse files

Remove docker directory

Remove the docker directory (yay) and old build tools.

This will result in an f21 failing gate - however, I have a patch
submission to remove that gate from our project configuration.

Change-Id: I3c461cedb6906422c8076f60c470e773d6cdcf33
Partially-Implements: blueprint remove-docker-dir
parent 5c82e0c9
No related branches found
No related tags found
No related merge requests found
Showing
with 0 additions and 171 deletions
...@@ -71,9 +71,6 @@ Directories ...@@ -71,9 +71,6 @@ Directories
Ansible. Ansible.
- demos - Contains a few demos to use with Kolla. - demos - Contains a few demos to use with Kolla.
- devenv - Contains an OpenStack-Heat based development environment. - devenv - Contains an OpenStack-Heat based development environment.
- docker - Contains a normal Dockerfile based set of artifacts for
building docker. This is planned for removal when docker\_templates
is completed.
- docs - Contains documentation. - docs - Contains documentation.
- etc - Contains a reference etc directory structure which requires - etc - Contains a reference etc directory structure which requires
configuration of a small number of configuration variables to achieve configuration of a small number of configuration variables to achieve
......
FROM centos
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Set up repositories
# This repository provides all dependencies used by RDO OpenStack
RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm
# This repository provides latest packages built from trunk master into RPMs
RUN curl http://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean-current.repo
# This repository turns off auth in PAM so we can operate on Ubuntu 14.04
RUN curl https://copr.fedoraproject.org/coprs/sdake/pam.noaudit/repo/epel-7/sdake-pam.noaudit-epel-7.repo -o /etc/yum.repos.d/sdake-pam.noaudit-epel-7.repo
# CentOS 7.1 workaround for conflicting packages with libvirt
RUN rpm -e --nodeps systemd-container systemd-container-libs
RUN rpm -e --nodeps yum-plugin-fastestmirror
RUN yum -d 10 -y install systemd systemd-libs systemd-devel && yum clean all
RUN yum install -y epel-release && yum clean all
# Update packages
RUN yum update -y && yum clean all
# Install base packages
RUN yum install -y \
mariadb \
mariadb-libs \
openssl \
openstack-utils \
pyparsing \
python-alembic \
python-amqp \
python-amqplib \
python-anyjson \
python-boto \
python-cheetah \
python-cliff \
python-cmd2 \
python-croniter \
python-crypto \
python-d2to1 \
python-docutils \
python-dogpile-cache \
python-dogpile-core \
python-empy \
python-eventlet \
python-flask \
python-futures \
python-greenlet \
python-httplib2 \
python-iso8601 \
python-itsdangerous \
python-jinja2 \
python-jsonpatch \
python-jsonpath-rw \
python-jsonpointer \
python-jsonschema \
python-keyring \
python-kombu \
python-ldap \
python-lesscpy \
python-lockfile \
python-lxml \
python-markdown \
python-memcached \
python-migrate \
python-msgpack \
python-netifaces \
python-networkx \
python-oauthlib \
python-oslo-config \
python-oslo-messaging \
python-oslo-rootwrap \
python-oslo-policy \
python-paramiko \
python-passlib \
python-paste-deploy \
python-pbr \
python-pecan \
python-pip \
python-ply \
python-prettytable \
python-psutil \
python-pycadf \
python-pygments \
python-pymongo \
python-qpid \
python-repoze-lru \
python-requests \
python-routes \
python-simplegeneric \
python-simplejson \
python-singledispatch \
python-six \
python-sqlalchemy \
python-stevedore \
python-taskflow \
python-versiontools \
python-warlock \
python-webob \
python-websockify \
python-webtest \
python-werkzeug \
python-wsme \
&& yum clean all
# TODO(inc0): when oslo_service lands in delorean, change pip to yum
# necessary until https://bugzilla.redhat.com/show_bug.cgi?id=1229477 is fixed
# This is dirty like zebra. This works around a bug in Ubuntu 14.04 LTS. The
# --net=host option does not work on ubuntu 14.04 because of a kernel bug. One
# workaround is to buid pam without authentication.
# See:
# https://registry.hub.docker.com/u/sequenceiq/pam/
#
RUN rpm -e --nodeps pam
RUN yum -y install pam+noaudit && yum clean all
# End dirty like zebra
COPY kolla-common.sh /opt/kolla/
../../../../tools/build-docker-image
\ No newline at end of file
../../../common/base/kolla-common.sh
\ No newline at end of file
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-alarm && yum clean all
COPY ./start.sh /start.sh
COPY config-external.sh /opt/kolla/
CMD ["/start.sh"]
../../../../../tools/build-docker-image
\ No newline at end of file
../../../../common/ceilometer/ceilometer-alarm/config-external.sh
\ No newline at end of file
../../../../common/ceilometer/ceilometer-alarm/start.sh
\ No newline at end of file
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-api && yum clean all
COPY ./start.sh /start.sh
COPY config-external.sh /opt/kolla/
CMD ["/start.sh"]
../../../../../tools/build-docker-image
\ No newline at end of file
../../../../common/ceilometer/ceilometer-api/config-external.sh
\ No newline at end of file
../../../../common/ceilometer/ceilometer-api/start.sh
\ No newline at end of file
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
../../../../../tools/build-docker-image
\ No newline at end of file
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-central && yum clean all
COPY ./start.sh /start.sh
COPY config-external.sh /opt/kolla/
CMD ["/start.sh"]
../../../../../tools/build-docker-image
\ No newline at end of file
../../../../common/ceilometer/ceilometer-central/config-external.sh
\ No newline at end of file
../../../../common/ceilometer/ceilometer-central/start.sh
\ No newline at end of file
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-collector && yum clean all
COPY ./start.sh /start.sh
COPY config-external.sh /opt/kolla/
CMD ["/start.sh"]
../../../../../tools/build-docker-image
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment