diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/panko/panko-api/Dockerfile.j2 | 30 | ||||
| -rw-r--r-- | docker/panko/panko-api/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/panko/panko-base/Dockerfile.j2 | 58 | ||||
| -rw-r--r-- | docker/panko/panko-base/extend_start.sh | 15 |
5 files changed, 0 insertions, 115 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 23a35a1cc..019fad8de 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -15,14 +15,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openstack-ceilometer-common', 'python3-gnocchiclient', 'python3-oslo-db', - 'python3-panko', 'python3-tooz' ] %} {% elif base_package_type == 'deb' %} {% set ceilometer_base_packages = [ 'ceilometer-common', 'python3-gnocchiclient', - 'python3-panko', 'python3-pymongo' ] %} {% endif %} diff --git a/docker/panko/panko-api/Dockerfile.j2 b/docker/panko/panko-api/Dockerfile.j2 deleted file mode 100644 index 1d1d56062..000000000 --- a/docker/panko/panko-api/Dockerfile.j2 +++ /dev/null @@ -1,30 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}panko-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block panko_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set panko_api_packages = [ - 'openstack-panko-api', - 'python3-pymongo' - ] %} - {% elif base_package_type == 'deb' %} - {% set panko_api_packages = [ - 'panko-api', - 'python3-pymongo' - ] %} - - {% endif %} -{{ macros.install_packages(panko_api_packages | customizable("packages")) }} -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_panko_extend_start -RUN chmod 755 /usr/local/bin/kolla_panko_extend_start - -{% block panko_api_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/panko/panko-api/extend_start.sh b/docker/panko/panko-api/extend_start.sh deleted file mode 100644 index b7902e854..000000000 --- a/docker/panko/panko-api/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# 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 - panko-dbsync - exit 0 -fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2 deleted file mode 100644 index 23af2af02..000000000 --- a/docker/panko/panko-base/Dockerfile.j2 +++ /dev/null @@ -1,58 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block panko_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='panko') }} - -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - - {% set panko_base_packages = [ - 'openstack-panko-common', - ] %} - {% elif base_package_type == 'deb' %} - {% set panko_base_packages = [ - ] %} - {% endif %} - -{{ macros.install_packages(panko_base_packages | customizable("packages")) }} -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - - {% set panko_base_packages = [ - ] %} -{{ macros.install_packages(panko_base_packages | customizable("packages")) }} - {% elif base_package_type == 'deb' %} - - {% set panko_base_packages = [ - ] %} - -{{ macros.install_packages(panko_base_packages | customizable("packages")) }} - - {% endif %} -ADD panko-base-archive /panko-base-source - -{% set panko_base_pip_packages = [ - '/panko', - 'pymongo' -] %} - -RUN ln -s panko-base-source/* panko \ - && {{ macros.install_pip(panko_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/panko \ - && cp -r /panko/etc/panko/* /etc/panko/ \ - && chown -R panko: /etc/panko - -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN touch /usr/local/bin/kolla_panko_extend_start \ - && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_panko_extend_start - -{% block panko_base_footer %}{% endblock %} diff --git a/docker/panko/panko-base/extend_start.sh b/docker/panko/panko-base/extend_start.sh deleted file mode 100644 index 32cb5a96b..000000000 --- a/docker/panko/panko-base/extend_start.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -PANKO_LOG_DIR=/var/log/kolla/panko - -if [[ ! -d "${PANKO_LOG_DIR}" ]]; then - mkdir -p ${PANKO_LOG_DIR} -fi -if [[ $(stat -c %U:%G ${PANKO_LOG_DIR}) != "panko:kolla" ]]; then - chown panko:kolla ${PANKO_LOG_DIR} -fi -if [[ $(stat -c %a ${PANKO_LOG_DIR}) != "755" ]]; then - chmod 755 ${PANKO_LOG_DIR} -fi - -. /usr/local/bin/kolla_panko_extend_start |
