aboutsummaryrefslogtreecommitdiff
path: root/docker/centos/source
diff options
context:
space:
mode:
Diffstat (limited to 'docker/centos/source')
-rw-r--r--docker/centos/source/magnum/magnum-api/Dockerfile6
l---------docker/centos/source/magnum/magnum-api/check.sh1
l---------docker/centos/source/magnum/magnum-api/config-internal.sh1
-rw-r--r--docker/centos/source/magnum/magnum-base/Dockerfile2
l---------docker/centos/source/magnum/magnum-base/config-magnum.sh1
-rw-r--r--docker/centos/source/magnum/magnum-conductor/Dockerfile5
l---------docker/centos/source/magnum/magnum-conductor/config-internal.sh1
7 files changed, 4 insertions, 13 deletions
diff --git a/docker/centos/source/magnum/magnum-api/Dockerfile b/docker/centos/source/magnum/magnum-api/Dockerfile
index 2173a7b42..aa39615e7 100644
--- a/docker/centos/source/magnum/magnum-api/Dockerfile
+++ b/docker/centos/source/magnum/magnum-api/Dockerfile
@@ -1,9 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%magnum-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
-COPY ./start.sh /start.sh
-COPY ./check.sh /check.sh
-
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
CMD ["/start.sh"]
diff --git a/docker/centos/source/magnum/magnum-api/check.sh b/docker/centos/source/magnum/magnum-api/check.sh
deleted file mode 120000
index 7464ba296..000000000
--- a/docker/centos/source/magnum/magnum-api/check.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/magnum/magnum-api/check.sh \ No newline at end of file
diff --git a/docker/centos/source/magnum/magnum-api/config-internal.sh b/docker/centos/source/magnum/magnum-api/config-internal.sh
deleted file mode 120000
index 7f9cace39..000000000
--- a/docker/centos/source/magnum/magnum-api/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/magnum/magnum-api/config-internal.sh \ No newline at end of file
diff --git a/docker/centos/source/magnum/magnum-base/Dockerfile b/docker/centos/source/magnum/magnum-base/Dockerfile
index 6c4453043..ffcee610f 100644
--- a/docker/centos/source/magnum/magnum-base/Dockerfile
+++ b/docker/centos/source/magnum/magnum-base/Dockerfile
@@ -11,5 +11,3 @@ RUN cd /magnum \
&& mkdir /etc/magnum /var/log/magnum \
&& cp -r /magnum/etc/* /etc/magnum/ \
&& rm -rf /root/.cache
-
-COPY config-magnum.sh /opt/kolla/
diff --git a/docker/centos/source/magnum/magnum-base/config-magnum.sh b/docker/centos/source/magnum/magnum-base/config-magnum.sh
deleted file mode 120000
index 473c0be8e..000000000
--- a/docker/centos/source/magnum/magnum-base/config-magnum.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/magnum/magnum-base/config-magnum.sh \ No newline at end of file
diff --git a/docker/centos/source/magnum/magnum-conductor/Dockerfile b/docker/centos/source/magnum/magnum-conductor/Dockerfile
index 72de63888..6790aeeff 100644
--- a/docker/centos/source/magnum/magnum-conductor/Dockerfile
+++ b/docker/centos/source/magnum/magnum-conductor/Dockerfile
@@ -4,8 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install kubectl binary (ugh)
RUN cd /tmp && curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz && /usr/bin/tar -xzvf /tmp/kubernetes.tar.gz && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl && rm -rf /tmp/kubernetes
-COPY ./start.sh /start.sh
-
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
CMD ["/start.sh"]
diff --git a/docker/centos/source/magnum/magnum-conductor/config-internal.sh b/docker/centos/source/magnum/magnum-conductor/config-internal.sh
deleted file mode 120000
index 1d8f73aa9..000000000
--- a/docker/centos/source/magnum/magnum-conductor/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/magnum/magnum-conductor/config-internal.sh \ No newline at end of file