diff options
| author | Kendall Nelson <kennelson11@gmail.com> | 2020-12-17 13:21:50 -0800 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-12-18 20:54:36 +0100 |
| commit | d4a68553b2337e2f820ff4657faaed433c2b310f (patch) | |
| tree | 1192dd6337030b1ef5eddb4159ee26face0d8cab /docker/karbor/karbor-base | |
| parent | cdd0eb7914fb01dac969386feffd8a0eb64347c8 (diff) | |
| download | kolla-d4a68553b2337e2f820ff4657faaed433c2b310f.tar.gz kolla-d4a68553b2337e2f820ff4657faaed433c2b310f.zip | |
Remove Retired Karbor Support
As announced on the openstack-discuss ML[1], Karbor is retiring
this cycle (Wallaby).
Needed-By: https://review.opendev.org/c/openstack/karbor/+/767032
[1] http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018643.html
Change-Id: I0b8b1782874282636552f3ffe924a8d512d48959
Diffstat (limited to 'docker/karbor/karbor-base')
| -rw-r--r-- | docker/karbor/karbor-base/Dockerfile.j2 | 38 | ||||
| -rw-r--r-- | docker/karbor/karbor-base/extend_start.sh | 10 |
2 files changed, 0 insertions, 48 deletions
diff --git a/docker/karbor/karbor-base/Dockerfile.j2 b/docker/karbor/karbor-base/Dockerfile.j2 deleted file mode 100644 index bb8c3eff3..000000000 --- a/docker/karbor/karbor-base/Dockerfile.j2 +++ /dev/null @@ -1,38 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block karbor_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='karbor') }} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - -ADD karbor-base-archive /karbor-base-source - -{% set karbor_base_pip_packages = [ - '/karbor' -] %} - -RUN ln -s karbor-base-source/* karbor \ - && {{ macros.install_pip(karbor_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/karbor \ - && cp -r /karbor/etc/* /etc/karbor/ \ - && chown -R karbor: /etc/karbor - -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN touch /usr/local/bin/kolla_karbor_extend_start \ - && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_karbor_extend_start - -{% block karbor_base_footer %}{% endblock %} diff --git a/docker/karbor/karbor-base/extend_start.sh b/docker/karbor/karbor-base/extend_start.sh deleted file mode 100644 index db0fdacc8..000000000 --- a/docker/karbor/karbor-base/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/karbor" ]]; then - mkdir -p /var/log/kolla/karbor -fi -if [[ $(stat -c %a /var/log/kolla/karbor) != "755" ]]; then - chmod 755 /var/log/kolla/karbor -fi - -. /usr/local/bin/kolla_karbor_extend_start |