diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-25 19:51:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-25 19:51:25 +0000 |
| commit | 45546c249385bc95cba4180bb2fb83a7b20c02d5 (patch) | |
| tree | 1acd867dc278b8e874b947a53c4bd698011b244b /docker | |
| parent | bface0f6cd75ca901c2511fb05ef48ca6a4bc370 (diff) | |
| parent | 0f18d8f0c47d00cbdf8f6bf344dfcaf8cc57b732 (diff) | |
| download | kolla-45546c249385bc95cba4180bb2fb83a7b20c02d5.tar.gz kolla-45546c249385bc95cba4180bb2fb83a7b20c02d5.zip | |
Merge "Add build from source for Barbican"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/centos/source/barbican/.buildinfo | 10 | ||||
| -rw-r--r-- | docker/centos/source/barbican/Dockerfile | 19 | ||||
| l--------- | docker/centos/source/barbican/build | 1 | ||||
| l--------- | docker/centos/source/barbican/config-external.sh | 1 | ||||
| l--------- | docker/centos/source/barbican/config-internal.sh | 1 | ||||
| l--------- | docker/centos/source/barbican/start.sh | 1 | ||||
| -rw-r--r-- | docker/centos/source/base/Dockerfile | 2 |
7 files changed, 35 insertions, 0 deletions
diff --git a/docker/centos/source/barbican/.buildinfo b/docker/centos/source/barbican/.buildinfo new file mode 100644 index 000000000..3ac7ec7fe --- /dev/null +++ b/docker/centos/source/barbican/.buildinfo @@ -0,0 +1,10 @@ +# Build info specific to this image. All values can be overridden in .buildconf + +COMPONENT=barbican +SOURCE_INSTALL_AVAILABLE=1 + +# Used for git install method +: ${CLONE_FROM:=https://github.com/openstack/barbican} + +# Used for curl install method +: ${TARBALL_URI:=http://tarballs.openstack.org/barbican/barbican-master.tar.gz} diff --git a/docker/centos/source/barbican/Dockerfile b/docker/centos/source/barbican/Dockerfile new file mode 100644 index 000000000..92cbe3fea --- /dev/null +++ b/docker/centos/source/barbican/Dockerfile @@ -0,0 +1,19 @@ +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +ADD ./barbican.tar / +RUN ln -s /barbican-* /barbican + +RUN cd /barbican \ + && useradd --user-group barbican \ + && pip install uwsgi \ + && pip install -r requirements.txt \ + && pip install /barbican \ + && mkdir /etc/barbican /var/log/barbican \ + && cp -r /barbican/etc/* /etc/barbican \ + && rm -rf /root/.cache + +COPY ./start.sh /start.sh +COPY config-internal.sh config-external.sh /opt/kolla/ + +CMD ["/start.sh"] diff --git a/docker/centos/source/barbican/build b/docker/centos/source/barbican/build new file mode 120000 index 000000000..8d652f7ee --- /dev/null +++ b/docker/centos/source/barbican/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/barbican/config-external.sh b/docker/centos/source/barbican/config-external.sh new file mode 120000 index 000000000..5a0d7a06c --- /dev/null +++ b/docker/centos/source/barbican/config-external.sh @@ -0,0 +1 @@ +../../../common/barbican/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/barbican/config-internal.sh b/docker/centos/source/barbican/config-internal.sh new file mode 120000 index 000000000..393328cd9 --- /dev/null +++ b/docker/centos/source/barbican/config-internal.sh @@ -0,0 +1 @@ +../../../common/barbican/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/source/barbican/start.sh b/docker/centos/source/barbican/start.sh new file mode 120000 index 000000000..fbb47be02 --- /dev/null +++ b/docker/centos/source/barbican/start.sh @@ -0,0 +1 @@ +../../../common/barbican/start.sh
\ No newline at end of file diff --git a/docker/centos/source/base/Dockerfile b/docker/centos/source/base/Dockerfile index fad567713..2a9877b58 100644 --- a/docker/centos/source/base/Dockerfile +++ b/docker/centos/source/base/Dockerfile @@ -13,12 +13,14 @@ RUN yum install -y \ mariadb-devel \ mysql-devel \ MySQL-python \ + openldap-devel \ openssl \ openssl-devel \ postgresql \ postgresql-devel \ python-devel \ python-oslo-policy \ + sqlite-devel \ tar \ && yum clean all |
