diff options
| author | Emilien Macchi <emilien@redhat.com> | 2020-05-04 13:34:30 -0400 |
|---|---|---|
| committer | Christian Berendt <berendt@betacloud-solutions.de> | 2020-05-29 10:08:57 +0200 |
| commit | 1a41c298cfcfba53956cb73208035f28c0a3d4a0 (patch) | |
| tree | d1cb0ba9100e65069df619b5515a4a092ab8ef36 /docker | |
| parent | 834ffd912a130c552cbe1ff9a416dea95599a3e4 (diff) | |
| download | kolla-1a41c298cfcfba53956cb73208035f28c0a3d4a0.tar.gz kolla-1a41c298cfcfba53956cb73208035f28c0a3d4a0.zip | |
Remove tripleoclient container from Kolla
This container was never needed or useful so far; let's remove it from
Kolla.
Depends-On: https://review.opendev.org/725349
Change-Id: I2c80080a5b2203c6b22c361f2b6126d65c0c50dc
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/tripleoclient/Dockerfile.j2 | 40 | ||||
| -rw-r--r-- | docker/tripleoclient/create_super_user.sh | 18 |
2 files changed, 0 insertions, 58 deletions
diff --git a/docker/tripleoclient/Dockerfile.j2 b/docker/tripleoclient/Dockerfile.j2 deleted file mode 100644 index be406c7be..000000000 --- a/docker/tripleoclient/Dockerfile.j2 +++ /dev/null @@ -1,40 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block tripleoclient_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set tripleoclient_packages = [ - 'e2fsprogs', - 'git', - 'openssh-clients', - 'openstack-tripleo-validations', - 'puppet-tripleo', - 'python3-openstackclient', - 'python3-tripleoclient', - 'xfsprogs' - ] %} - -{{ macros.install_packages(tripleoclient_packages | customizable("packages")) }} - - {% else %} -RUN echo 'tripleoclient not yet available for {{ base_distro }}' && /bin/false - {% endif %} - -{% elif install_type == 'source' %} - - -RUN echo 'tripleoclient not yet available for {{ base_distro }} source installs' && /bin/false - -{% endif %} - -COPY create_super_user.sh /usr/local/bin/create_super_user.sh -RUN chmod 750 /usr/local/bin/create_super_user.sh - -{% block tripleoclient_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/tripleoclient/create_super_user.sh b/docker/tripleoclient/create_super_user.sh deleted file mode 100644 index 37c8bf1df..000000000 --- a/docker/tripleoclient/create_super_user.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# This is a useful entrypoint/cmd if you wish to run commands in a container -# in an existing users $HOME directory -# For example: docker run -ti -e USER=stack -e UID=1000 --privileged=true --volume=/home/stack/:/home/stack/ tripleoclient:latest /usr/local/bin/create_super_user.sh - -if [ -n "$USER" -a -n "$UID" ]; then - useradd "$USER" -u "$UID" -M -cat >> /etc/sudoers <<EOF_CAT -$USER ALL=(ALL) NOPASSWD:ALL -EOF_CAT - su -l $USER - export TERM="xterm" - alias ls='ls --color=auto' - /bin/bash -else - echo "Please set valid $USER and $UID env variables." - exit 1 -fi |
