diff options
Diffstat (limited to 'docker/kuryr')
| -rw-r--r-- | docker/kuryr/kuryr-base/Dockerfile.j2 | 30 | ||||
| -rw-r--r-- | docker/kuryr/kuryr-base/extend_start.sh | 15 | ||||
| -rw-r--r-- | docker/kuryr/kuryr-libnetwork/Dockerfile.j2 | 40 |
3 files changed, 0 insertions, 85 deletions
diff --git a/docker/kuryr/kuryr-base/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2 deleted file mode 100644 index 025e0cdf6..000000000 --- a/docker/kuryr/kuryr-base/Dockerfile.j2 +++ /dev/null @@ -1,30 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block kuryr_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='kuryr') }} - -ADD kuryr-base-archive /kuryr-base-source - -{% set kuryr_base_pip_packages = [ - '/kuryr-base' -] %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -# NOTE(Jeffrey4l): remove kuryr-lib constraint in upper-constraints.txt file. -# Otherwise, it will be failed. -RUN ln -s kuryr-base-source/* kuryr-base \ - && {{ macros.upper_constraints_remove("kuryr-lib") }} \ - && {{ macros.install_pip(kuryr_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/kuryr \ - && chmod 644 /usr/local/bin/kolla_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block kuryr_base_footer %}{% endblock %} diff --git a/docker/kuryr/kuryr-base/extend_start.sh b/docker/kuryr/kuryr-base/extend_start.sh deleted file mode 100644 index b109ce4f6..000000000 --- a/docker/kuryr/kuryr-base/extend_start.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -KURYR_LOG_DIR=/var/log/kolla/kuryr -KURYR_DOCKER_PLUGINS_DIR=/usr/lib/docker/plugins/kuryr - -if [[ ! -d "${KURYR_LOG_DIR}" ]]; then - mkdir -p ${KURYR_LOG_DIR} -fi -if [[ $(stat -c %a ${KURYR_LOG_DIR}) != "755" ]]; then - chmod 755 ${KURYR_LOG_DIR} -fi - -if [[ ! -d "${KURYR_DOCKER_PLUGINS_DIR}" ]]; then - mkdir -p ${KURYR_DOCKER_PLUGINS_DIR} -fi diff --git a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 deleted file mode 100644 index 8764cbb84..000000000 --- a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 +++ /dev/null @@ -1,40 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}kuryr-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block kuryr_libnetwork_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - -{{ macros.enable_extra_repos(['openvswitch']) }} - - {% set kuryr_libnetwork_packages = [ - 'openvswitch${KOLLA_RPM_OVS_VERSION}' - ] %} - -{% elif base_package_type == 'deb' %} - - {% set kuryr_libnetwork_packages = [ - 'bridge-utils', - 'openvswitch-switch' - ] %} - -{% endif %} -{{ macros.install_packages(kuryr_libnetwork_packages | customizable("packages")) }} - -ADD kuryr-libnetwork-archive /kuryr-libnetwork-source - -{% set kuryr_libnetwork_pip_packages = [ - '/kuryr-libnetwork' -] %} - -RUN ln -s kuryr-libnetwork-source/* kuryr-libnetwork \ - && {{ macros.install_pip(kuryr_libnetwork_pip_packages | customizable("pip_packages")) }} - -{{ macros.kolla_patch_sources() }} - -{% block kuryr_libnetwork_footer %}{% endblock %} -{% block footer %}{% endblock %} |
