From e364113adcb529cc06575133b0e377526516f715 Mon Sep 17 00:00:00 2001 From: gugug Date: Sun, 14 Jun 2020 14:01:14 +0800 Subject: Remove mongodb dockerfile from kolla more info: https://opendev.org/openstack/kolla-ansible/commit/a6c97d7284c7de437ebfc9f8ee289244f29e65d7 Change-Id: I9e8a973e10389d42d6fedffb98bd23f1a8271087 Co-Authored-By: jacky06 --- docker/mongodb/Dockerfile.j2 | 35 ----------------------------------- docker/mongodb/extend_start.sh | 18 ------------------ docker/mongodb/mongodb_sudoers | 1 - 3 files changed, 54 deletions(-) delete mode 100644 docker/mongodb/Dockerfile.j2 delete mode 100644 docker/mongodb/extend_start.sh delete mode 100644 docker/mongodb/mongodb_sudoers (limited to 'docker') diff --git a/docker/mongodb/Dockerfile.j2 b/docker/mongodb/Dockerfile.j2 deleted file mode 100644 index 1a41438e1..000000000 --- a/docker/mongodb/Dockerfile.j2 +++ /dev/null @@ -1,35 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block mongodb_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='mongodb') }} - -{% if base_package_type == 'rpm' %} - {% set mongodb_packages = [ - 'mongodb', - 'mongodb-server' - ] %} -{% elif base_package_type == 'deb' %} - {% set mongodb_packages = [ - 'mongodb-server' - ] %} -{% endif %} - -{{ macros.install_packages(mongodb_packages | customizable("packages")) }} - -COPY mongodb_sudoers /etc/sudoers.d/kolla_mongodb_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN chmod 755 /usr/local/bin/kolla_extend_start \ - && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_mongodb_sudoers - -{% block mongodb_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER mongodb diff --git a/docker/mongodb/extend_start.sh b/docker/mongodb/extend_start.sh deleted file mode 100644 index 8d8933f90..000000000 --- a/docker/mongodb/extend_start.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -echo "run extended start" - -if [[ ! -d "/var/log/kolla/mongodb" ]]; then - mkdir -p /var/log/kolla/mongodb -fi - -if [[ $(stat -c %a /var/log/kolla/mongodb) != "755" ]]; then - chmod 755 /var/log/kolla/mongodb -fi - -# 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 - sudo chown mongodb: /var/lib/mongodb/ - exit 0 -fi diff --git a/docker/mongodb/mongodb_sudoers b/docker/mongodb/mongodb_sudoers deleted file mode 100644 index 8a8f4e3cc..000000000 --- a/docker/mongodb/mongodb_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /usr/bin/chown mongodb\: /var/lib/mongodb/, /bin/chown mongodb\: /var/lib/mongodb/ -- cgit v1.2.3