diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu | 3 | ||||
| -rw-r--r-- | docker/qdrouterd/Dockerfile.j2 | 41 | ||||
| -rw-r--r-- | docker/qdrouterd/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/qdrouterd/qdrouterd_sudoers | 1 |
5 files changed, 57 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 2e575df82..8a6d04470 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -297,6 +297,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {# 46095ACC8548582C1A2699A9D27D666CD88E42B4 -- Elasticsearch (Elasticsearch Signing Key) <dev_ops@elasticsearch.org> #} {# 4D1BB29D63D98E422B2113B19334A25F8507EFA5 -- Percona MySQL Development Team (Packaging key) <mysql-dev@percona.com> #} {# 58118E89F3A912897C070ADBF76221572C52609D -- Docker Release Tool (releasedocker) <docker@docker.com> #} + {# 4D8EB5FDA37AB55F41A135203BF88A0C6A770882 -- Apache Qpid PPA Signing Key <dev@qpid.apache.org> #} {# 901F9177AB97ACBE -- Treasure Data, Inc (Treasure Agent Official Signing key) <support@treasure-data.com> #} {% set base_apt_keys = [ '05CE15085FC09D18E99EFB22684A14CF2582E0C5', @@ -306,6 +307,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences '46095ACC8548582C1A2699A9D27D666CD88E42B4', '4D1BB29D63D98E422B2113B19334A25F8507EFA5', '58118E89F3A912897C070ADBF76221572C52609D', + '4D8EB5FDA37AB55F41A135203BF88A0C6A770882', '901F9177AB97ACBE', ] %} {% elif base_distro == 'debian' %} diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index 9ec6da2e5..d81692fdb 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -35,3 +35,6 @@ deb https://packagecloud.io/grafana/stable/debian/ jessie main # Fluentd repo deb http://packages.treasuredata.com/2/ubuntu/xenial/ xenial contrib + +# Qdrouterd repo +deb http://ppa.launchpad.net/qpid/released/ubuntu/ xenial main diff --git a/docker/qdrouterd/Dockerfile.j2 b/docker/qdrouterd/Dockerfile.j2 new file mode 100644 index 000000000..e8ce9339a --- /dev/null +++ b/docker/qdrouterd/Dockerfile.j2 @@ -0,0 +1,41 @@ +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block qdrouterd_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{{ macros.configure_user(name='qdrouterd') }} + +{% block qdrouterd_install %} +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set qdrouterd_packages = [ + 'cyrus-sasl-lib', + 'cyrus-sasl-plain', + 'qpid-dispatch-router' + ] %} + +{{ macros.install_packages(qdrouterd_packages | customizable("packages")) }} + +{% elif base_distro in ['debian', 'ubuntu'] %} + {% set qdrouterd_packages = [ + 'sasl2-bin', + 'libpython2.7', + 'qdrouterd', + ] %} + +{{ macros.install_packages(qdrouterd_packages | customizable("packages")) }} + +{% endif %} +{% endblock %} + +COPY extend_start.sh /usr/local/bin/kolla_extend_start +COPY qdrouterd_sudoers /etc/sudoers.d/kolla_qdrouterd_sudoers +RUN chmod 755 /usr/local/bin/kolla_extend_start \ + && chmod 750 /etc/sudoers.d \ + && chmod 440 /etc/sudoers.d/kolla_qdrouterd_sudoers + +{% block qdrouterd_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER qdrouterd diff --git a/docker/qdrouterd/extend_start.sh b/docker/qdrouterd/extend_start.sh new file mode 100644 index 000000000..829b0758b --- /dev/null +++ b/docker/qdrouterd/extend_start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# Create log directory, with appropriate permissions +QDROUTERD_LOG_DIR="/var/log/kolla/qdrouterd" +if [[ ! -d "${QDROUTERD_LOG_DIR}" ]]; then + mkdir -p ${QDROUTERD_LOG_DIR} +fi +if [[ $(stat -c %a ${QDROUTERD_LOG_DIR}) != "755" ]]; then + chmod 755 ${QDROUTERD_LOG_DIR} +fi diff --git a/docker/qdrouterd/qdrouterd_sudoers b/docker/qdrouterd/qdrouterd_sudoers new file mode 100644 index 000000000..dbcd341a4 --- /dev/null +++ b/docker/qdrouterd/qdrouterd_sudoers @@ -0,0 +1 @@ +%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R qdrouterd\: /var/lib/qdrouterd, /bin/chown -R qdrouterd\: /var/lib/qdrouterd |