diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-01 13:41:14 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-09 17:44:26 +0200 |
| commit | 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (patch) | |
| tree | 05427aa46ce6473684cfe2a824798306291546c9 /docker/keystone/keystone-base | |
| parent | cabfd0f3eff38e2c10cdc7cf4e9271d72eeca91a (diff) | |
| download | kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.tar.gz kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.zip | |
docker: drop binary parts
Big patch drops all mentions of binary images support. Suggestions are
welcome how to split it into parts or handle better.
Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
Diffstat (limited to 'docker/keystone/keystone-base')
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 65 |
1 files changed, 15 insertions, 50 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 2176db3e1..fc5f814a2 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -9,58 +9,25 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='keystone') }} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set keystone_base_packages = [ - 'mod_auth_mellon', - 'mod_auth_openidc', - 'openstack-keystone', - 'python3-ldappool' - ] %} +{% if base_package_type == 'rpm' %} + {% set keystone_base_packages = [ + 'cyrus-sasl-devel', + 'mod_auth_mellon', + 'mod_auth_openidc', + 'openldap-devel', + ] %} RUN dnf module enable mod_auth_openidc -y +{% elif base_package_type == 'deb' %} + {% set keystone_base_packages = [ + 'libapache2-mod-auth-mellon', + 'libapache2-mod-auth-openidc', + 'libldap2-dev', + 'libsasl2-dev', + ] %} +{% endif %} {{ macros.install_packages(keystone_base_packages | customizable("packages")) }} -RUN mkdir -p /var/www/cgi-bin/keystone \ - && cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \ - && cp -a /usr/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin - - {% elif base_package_type == 'deb' %} - {% set keystone_base_packages = [ - 'keystone', - 'libapache2-mod-auth-mellon', - 'libapache2-mod-auth-openidc', - 'python3-ldappool' - ] %} - -{{ macros.install_packages(keystone_base_packages | customizable("packages")) }} -RUN mkdir -p /var/www/cgi-bin/keystone \ - && cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \ - && cp -a /usr/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \ - && rm -f /etc/apache2/sites-enabled/keystone.conf - - {% endif %} -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - {% set keystone_base_packages = [ - 'cyrus-sasl-devel', - 'mod_auth_mellon', - 'mod_auth_openidc', - 'openldap-devel', - ] %} - -RUN dnf module enable mod_auth_openidc -y - -{{ macros.install_packages(keystone_base_packages | customizable("packages")) }} - {% elif base_package_type == 'deb' %} - {% set keystone_base_packages = [ - 'libapache2-mod-auth-mellon', - 'libapache2-mod-auth-openidc', - 'libldap2-dev', - 'libsasl2-dev', - ] %} -{{ macros.install_packages(keystone_base_packages | customizable("packages")) }} - {% endif %} {% block keystone_source_install %} ADD keystone-base-archive /keystone-base-source @@ -78,8 +45,6 @@ RUN ln -s keystone-base-source/* keystone \ && chown -R keystone: /etc/keystone /var/www/cgi-bin/keystone {% endblock %} -{% endif %} - RUN chown -R keystone: /var/www/cgi-bin/keystone \ && chmod 755 /var/www/cgi-bin/keystone/* |
