From cb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Wed, 30 Sep 2015 11:23:39 +0000
Subject: Common start.sh

The majority of the start.sh code is identical. This removes that
duplicate code while still maintaining the ability to call code in a
specific container.

The start.sh is moved into /usr/local/bin/kolla_start in the container

The extend_start.sh script is called by the kolla_start script at the
location /usr/local/bin/kolla_extend_start . It always exists because
we create a noop kolla_extend_start in the base directory. We override
it with extend_start.sh in a specific image should we need to.

Of note, the neutron-agents container is exempt from this new
structure due to it being a fat container.

Additionally, we fix the inconsistent permissions throughout. 644 for
repo files and the scripts are set to 755 via a Docker RUN command to
ensure someones local perm change won't break upstream containers.

Change-Id: I7da8d19965463ad30ee522a71183e3f092e0d6ad
Closes-Bug: #1501295
---
 docker/logging/rsyslog/Dockerfile.j2 | 13 ++++++-------
 docker/logging/rsyslog/start.sh      |  7 -------
 2 files changed, 6 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 docker/logging/rsyslog/Dockerfile.j2
 delete mode 100755 docker/logging/rsyslog/start.sh

(limited to 'docker/logging')

diff --git a/docker/logging/rsyslog/Dockerfile.j2 b/docker/logging/rsyslog/Dockerfile.j2
old mode 100755
new mode 100644
index 60b81b5ba..db58b799a
--- a/docker/logging/rsyslog/Dockerfile.j2
+++ b/docker/logging/rsyslog/Dockerfile.j2
@@ -3,15 +3,14 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
-RUN yum -y install \
-        rsyslog \
+RUN yum -y install rsyslog \
     && yum clean all
+
 {% elif base_distro in ['ubuntu', 'debian'] %}
-RUN apt-get install -y --no-install-recommends \
-       rsyslog \
+
+RUN apt-get install -y --no-install-recommends rsyslog \
     && apt-get clean
-{% endif %}
 
-COPY start.sh /
+{% endif %}
 
-CMD ["/start.sh"]
+{{ include_footer }}
diff --git a/docker/logging/rsyslog/start.sh b/docker/logging/rsyslog/start.sh
deleted file mode 100755
index fea488a62..000000000
--- a/docker/logging/rsyslog/start.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD $ARGS
-- 
cgit v1.2.3