From 656ba297e725b406d39c5143da2c7ade3bbaad52 Mon Sep 17 00:00:00 2001 From: Harm Weites Date: Wed, 1 Jul 2015 23:34:17 +0200 Subject: Add config-internal/config-external to Glance containers Partially Implements: Blueprint standard-start Change-Id: I26e2fe52fe40efd001f9aae109ac6b7553d73264 --- docker/centos/binary/glance/glance-api/Dockerfile | 2 ++ docker/centos/binary/glance/glance-api/config-external.sh | 1 + docker/centos/binary/glance/glance-api/config-internal.sh | 1 + docker/centos/binary/glance/glance-registry/Dockerfile | 2 ++ docker/centos/binary/glance/glance-registry/config-external.sh | 1 + docker/centos/binary/glance/glance-registry/config-internal.sh | 1 + 6 files changed, 8 insertions(+) create mode 120000 docker/centos/binary/glance/glance-api/config-external.sh create mode 120000 docker/centos/binary/glance/glance-api/config-internal.sh create mode 120000 docker/centos/binary/glance/glance-registry/config-external.sh create mode 120000 docker/centos/binary/glance/glance-registry/config-internal.sh (limited to 'docker/centos/binary') diff --git a/docker/centos/binary/glance/glance-api/Dockerfile b/docker/centos/binary/glance/glance-api/Dockerfile index 5ff83508f..70e87a882 100644 --- a/docker/centos/binary/glance/glance-api/Dockerfile +++ b/docker/centos/binary/glance/glance-api/Dockerfile @@ -4,4 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh ADD ./check.sh /check.sh +COPY config-internal.sh config-external.sh /opt/kolla/ + CMD ["/start.sh"] diff --git a/docker/centos/binary/glance/glance-api/config-external.sh b/docker/centos/binary/glance/glance-api/config-external.sh new file mode 120000 index 000000000..46a22b7b3 --- /dev/null +++ b/docker/centos/binary/glance/glance-api/config-external.sh @@ -0,0 +1 @@ +../../../../common/glance/glance-api/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/glance/glance-api/config-internal.sh b/docker/centos/binary/glance/glance-api/config-internal.sh new file mode 120000 index 000000000..112e6557c --- /dev/null +++ b/docker/centos/binary/glance/glance-api/config-internal.sh @@ -0,0 +1 @@ +../../../../common/glance/glance-api/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/glance/glance-registry/Dockerfile b/docker/centos/binary/glance/glance-registry/Dockerfile index f950ce685..27269a03e 100644 --- a/docker/centos/binary/glance/glance-registry/Dockerfile +++ b/docker/centos/binary/glance/glance-registry/Dockerfile @@ -1,5 +1,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) +COPY config-internal.sh config-external.sh /opt/kolla/ + ADD ./start.sh /start.sh CMD ["/start.sh"] diff --git a/docker/centos/binary/glance/glance-registry/config-external.sh b/docker/centos/binary/glance/glance-registry/config-external.sh new file mode 120000 index 000000000..cfcbd1391 --- /dev/null +++ b/docker/centos/binary/glance/glance-registry/config-external.sh @@ -0,0 +1 @@ +../../../../common/glance/glance-registry/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/glance/glance-registry/config-internal.sh b/docker/centos/binary/glance/glance-registry/config-internal.sh new file mode 120000 index 000000000..c3d48cfc0 --- /dev/null +++ b/docker/centos/binary/glance/glance-registry/config-internal.sh @@ -0,0 +1 @@ +../../../../common/glance/glance-registry/config-internal.sh \ No newline at end of file -- cgit v1.2.3