aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-06-10 08:31:48 +0000
committerGerrit Code Review <review@openstack.org>2020-06-10 08:31:48 +0000
commited91acfe5ff23b34e01b28fede0d5601fbff9628 (patch)
tree9c87299e8949fda80a6885703ee998e9584168c1 /docker
parent8a42c20c47e158cc96ad78f951ae3589c2afbe54 (diff)
parent1a41c298cfcfba53956cb73208035f28c0a3d4a0 (diff)
downloadkolla-ed91acfe5ff23b34e01b28fede0d5601fbff9628.tar.gz
kolla-ed91acfe5ff23b34e01b28fede0d5601fbff9628.zip
Merge "Remove tripleoclient container from Kolla"
Diffstat (limited to 'docker')
-rw-r--r--docker/tripleoclient/Dockerfile.j240
-rw-r--r--docker/tripleoclient/create_super_user.sh18
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