diff options
Diffstat (limited to 'docker/venus')
| -rw-r--r-- | docker/venus/venus-api/Dockerfile.j2 | 18 | ||||
| -rw-r--r-- | docker/venus/venus-api/extend_start.sh | 8 | ||||
| -rw-r--r-- | docker/venus/venus-base/Dockerfile.j2 | 29 | ||||
| -rw-r--r-- | docker/venus/venus-base/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/venus/venus-manager/Dockerfile.j2 | 15 |
5 files changed, 0 insertions, 80 deletions
diff --git a/docker/venus/venus-api/Dockerfile.j2 b/docker/venus/venus-api/Dockerfile.j2 deleted file mode 100644 index 35ac69dca..000000000 --- a/docker/venus/venus-api/Dockerfile.j2 +++ /dev/null @@ -1,18 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}venus-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block venus_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -COPY extend_start.sh /usr/local/bin/kolla_venus_extend_start -RUN chmod 644 /usr/local/bin/kolla_venus_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block venus_api_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER venus diff --git a/docker/venus/venus-api/extend_start.sh b/docker/venus/venus-api/extend_start.sh deleted file mode 100644 index bbe03bbbc..000000000 --- a/docker/venus/venus-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 - venus_manager db sync - exit 0 -fi diff --git a/docker/venus/venus-base/Dockerfile.j2 b/docker/venus/venus-base/Dockerfile.j2 deleted file mode 100644 index 729ae6bd4..000000000 --- a/docker/venus/venus-base/Dockerfile.j2 +++ /dev/null @@ -1,29 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block venus_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='venus') }} - -ADD venus-base-archive /venus-base-source - -{% set venus_base_pip_packages = [ - '/venus' -] %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN ln -s venus-base-source/* venus \ - && {{ macros.install_pip(venus_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/venus \ - && cp -r /venus/etc/venus/* /etc/venus/ \ - && touch /usr/local/bin/kolla_venus_extend_start \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_venus_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block venus_base_footer %}{% endblock %} diff --git a/docker/venus/venus-base/extend_start.sh b/docker/venus/venus-base/extend_start.sh deleted file mode 100644 index fa7bbe54b..000000000 --- a/docker/venus/venus-base/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/venus" ]]; then - mkdir -p /var/log/kolla/venus -fi -if [[ $(stat -c %a /var/log/kolla/venus) != "755" ]]; then - chmod 755 /var/log/kolla/venus -fi - -. /usr/local/bin/kolla_venus_extend_start diff --git a/docker/venus/venus-manager/Dockerfile.j2 b/docker/venus/venus-manager/Dockerfile.j2 deleted file mode 100644 index 35575adb6..000000000 --- a/docker/venus/venus-manager/Dockerfile.j2 +++ /dev/null @@ -1,15 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}venus-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block venus_manager_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.kolla_patch_sources() }} - -{% block venus_manager_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER venus |
