From cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 28 Aug 2015 12:16:53 +0000 Subject: Move docker_templates to docker dir Updated build.py to reflect this change. Deprecate --template option and make it a noop. Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2 Partially-Implements: blueprint remove-docker-dir --- docker/murano/murano-api/Dockerfile.j2 | 9 +++++++++ docker/murano/murano-api/config-external.sh | 10 ++++++++++ docker/murano/murano-api/start.sh | 20 ++++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 docker/murano/murano-api/Dockerfile.j2 create mode 100644 docker/murano/murano-api/config-external.sh create mode 100755 docker/murano/murano-api/start.sh (limited to 'docker/murano/murano-api') diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 new file mode 100644 index 000000000..f1d7e1f42 --- /dev/null +++ b/docker/murano/murano-api/Dockerfile.j2 @@ -0,0 +1,9 @@ +FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-murano-base:{{ tag }} +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +COPY config-external.sh /opt/kolla/ +COPY start.sh / + +CMD ["/start.sh"] + +{{ include_footer }} diff --git a/docker/murano/murano-api/config-external.sh b/docker/murano/murano-api/config-external.sh new file mode 100644 index 000000000..5d9a2da49 --- /dev/null +++ b/docker/murano/murano-api/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/murano/murano.conf" +TARGET="/etc/murano/murano.conf" +OWNER="murano" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker/murano/murano-api/start.sh b/docker/murano/murano-api/start.sh new file mode 100755 index 000000000..7d712177d --- /dev/null +++ b/docker/murano/murano-api/start.sh @@ -0,0 +1,20 @@ +#!/bin/bash +set -o errexit + +CMD="/usr/bin/murano-api" +ARGS="--config-file /etc/murano/murano.conf" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Execute config strategy +set_configs + +# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases +# of the KOLLA_BOOTSTRAP variable being set, including empty. +if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then + su -s /bin/sh -c "murano-db-manage --config-file /etc/murano/murano.conf upgrade" murano + exit 0 +fi + +exec $CMD $ARGS -- cgit v1.2.3