diff options
| author | Zuul <zuul@review.opendev.org> | 2020-06-20 00:57:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-06-20 00:57:16 +0000 |
| commit | 504ec3b511914107034fc0cb7a8f0acb9974fc58 (patch) | |
| tree | b47537e3585d1304995203e80b8a3f5a984fa4b1 /docker/congress | |
| parent | 13f9303b96502dba9d8696909f7e27f44675574a (diff) | |
| parent | e332891a8af55cecfcdb1b96932029690b63037f (diff) | |
| download | kolla-504ec3b511914107034fc0cb7a8f0acb9974fc58.tar.gz kolla-504ec3b511914107034fc0cb7a8f0acb9974fc58.zip | |
Merge "Remove the congress images since it has been retired"
Diffstat (limited to 'docker/congress')
| -rw-r--r-- | docker/congress/congress-api/Dockerfile.j2 | 14 | ||||
| -rw-r--r-- | docker/congress/congress-api/extend_start.sh | 8 | ||||
| -rw-r--r-- | docker/congress/congress-base/Dockerfile.j2 | 46 | ||||
| -rw-r--r-- | docker/congress/congress-base/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/congress/congress-datasource/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | docker/congress/congress-policy-engine/Dockerfile.j2 | 11 |
6 files changed, 0 insertions, 100 deletions
diff --git a/docker/congress/congress-api/Dockerfile.j2 b/docker/congress/congress-api/Dockerfile.j2 deleted file mode 100644 index 9581cc602..000000000 --- a/docker/congress/congress-api/Dockerfile.j2 +++ /dev/null @@ -1,14 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block congress_api_header %}{% endblock %} - -COPY extend_start.sh /usr/local/bin/kolla_congress_extend_start -RUN chmod 755 /usr/local/bin/kolla_congress_extend_start - -{% block congress_api_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER congress diff --git a/docker/congress/congress-api/extend_start.sh b/docker/congress/congress-api/extend_start.sh deleted file mode 100644 index b18446d7f..000000000 --- a/docker/congress/congress-api/extend_start.sh +++ /dev/null @@ -1,8 +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 - congress-db-manage --config-file /etc/congress/congress.conf upgrade head - exit 0 -fi diff --git a/docker/congress/congress-base/Dockerfile.j2 b/docker/congress/congress-base/Dockerfile.j2 deleted file mode 100644 index ee1ca0f4c..000000000 --- a/docker/congress/congress-base/Dockerfile.j2 +++ /dev/null @@ -1,46 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix}}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block congress_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='congress') }} - -{% if install_type == 'binary' %} - {% if base_package_type == 'deb' %} - {% set congress_base_packages = [ - 'congress-common', - 'congress-server'] - %} - {% elif base_package_type == 'rpm' %} - {% set congress_base_packages = [ - 'openstack-congress'] - %} - {% endif %} - -{{ macros.install_packages(congress_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - -{% set congress_base_pip_packages = [ - '/congress' -] %} - -ADD congress-base-archive /congress-base-source -RUN ln -s congress-base-source/* congress \ - && {{ macros.install_pip(congress_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/congress \ - && cp -r /congress/etc/* /etc/congress/ \ - && chown -R congress: /etc/congress - -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN touch /usr/local/bin/kolla_congress_extend_start \ - && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_congress_extend_start - -{% block congress_base_footer %}{% endblock %} diff --git a/docker/congress/congress-base/extend_start.sh b/docker/congress/congress-base/extend_start.sh deleted file mode 100644 index 99e16e1bf..000000000 --- a/docker/congress/congress-base/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/congress" ]]; then - mkdir -p /var/log/kolla/congress -fi -if [[ $(stat -c %a /var/log/kolla/congress) != "755" ]]; then - chmod 755 /var/log/kolla/congress -fi - -. /usr/local/bin/kolla_congress_extend_start diff --git a/docker/congress/congress-datasource/Dockerfile.j2 b/docker/congress/congress-datasource/Dockerfile.j2 deleted file mode 100644 index 3cb903727..000000000 --- a/docker/congress/congress-datasource/Dockerfile.j2 +++ /dev/null @@ -1,11 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block congress_datasource_header %}{% endblock %} - -{% block congress_datasource_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER congress diff --git a/docker/congress/congress-policy-engine/Dockerfile.j2 b/docker/congress/congress-policy-engine/Dockerfile.j2 deleted file mode 100644 index 9e0fe5cf2..000000000 --- a/docker/congress/congress-policy-engine/Dockerfile.j2 +++ /dev/null @@ -1,11 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block congress_policy_engine_header %}{% endblock %} - -{% block congress_policy_engine_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER congress |
