X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FKeystone%2FDockerfile;h=e81a7b57c77fd36feba2f0c5b4a95ae0fa493894;hb=7f316e034d3d91811270b4e00372ee34e987a2b0;hp=263716a0de336bed7ea589790de5cf5f2c17fe41;hpb=28ec7590d29328b0afd9c9b0c1398e92883ed9a4;p=osm%2Fdevops.git

diff --git a/docker/Keystone/Dockerfile b/docker/Keystone/Dockerfile
index 263716a0..e81a7b57 100644
--- a/docker/Keystone/Dockerfile
+++ b/docker/Keystone/Dockerfile
@@ -1,9 +1,22 @@
-FROM ubuntu:16.04
+# Copyright 2021 Whitestack, LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact: fbravo@whitestack.com or glavado@whitestack.com
+##
 
-LABEL Maintainer="esousa@whitestack.com" \
-      Description="Openstack Keystone Instance" \
-      Version="1.0" \
-      Author="Eduardo Sousa"
+FROM ubuntu:20.04
 
 EXPOSE 5000
 
@@ -11,22 +24,76 @@ WORKDIR /keystone
 
 COPY scripts/start.sh /keystone/start.sh
 
-RUN apt-get update && \
-    apt-get upgrade -y && \
-    apt-get autoremove -y && \
-    apt-get install -y software-properties-common && \
-    add-apt-repository -y cloud-archive:queens && \
-    apt-get update && apt dist-upgrade -y && \
-    apt-get install -y python-openstackclient keystone apache2 libapache2-mod-wsgi net-tools mysql-client && \
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
+    DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common && \
+    add-apt-repository -y cloud-archive:victoria && \
+    DEBIAN_FRONTEND=noninteractive apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    apache2=2.4.* \
+    keystone=2:18.0.* \
+    libapache2-mod-wsgi-py3=4.6.* \
+    python3-pip=20.0.* \
+    build-essential=12.8* \
+    python3-dev=3.8.* \
+    libldap2-dev=2.4.* \
+    libsasl2-dev=2.1.* \
+    libssl-dev=1.1.* \
+    libffi-dev=3.3* \
+    libxml2-dev=2.9.* \
+    libxslt1-dev=1.1.* \
+    zlib1g-dev=1:1.2.* \
+    ldap-utils=2.4.* \
+    curl=7.68.* \
+    net-tools=1.60* \
+    mysql-client=8.0.* \
+    dnsutils=1:9.16.* && \
     rm -rf /var/lib/apt/lists/* && \
     chmod +x start.sh
 
-ENV DB_HOST                 keystone-db     # DB Hostname
-ENV DB_PORT                 3306            # DB Port
-ENV ROOT_DB_USER            root            # DB Root User
-ENV ROOT_DB_PASSWORD        admin           # DB Root Password
-ENV KEYSTONE_DB_PASSWORD    admin           # Keystone user password
-ENV ADMIN_PASSWORD          admin           # Admin password
-ENV NBI_PASSWORD            nbi             # NBI password
+RUN pip3 install -U pip==21.3.1 && \
+    pip3 install python-ldap==3.2.0 ldappool==3.0.0 python-openstackclient==5.7.0
 
-ENTRYPOINT ./start.sh
+# database
+ENV DB_HOST                 keystone-db
+ENV DB_PORT                 3306
+ENV ROOT_DB_USER            root
+ENV ROOT_DB_PASSWORD        admin
+ENV KEYSTONE_DB_PASSWORD    admin
+# keystone
+ENV REGION_ID               RegionOne
+ENV KEYSTONE_HOST           keystone
+# admin user
+ENV ADMIN_USERNAME          admin
+ENV ADMIN_PASSWORD          admin
+ENV ADMIN_PROJECT           admin
+# nbi service user
+ENV SERVICE_USERNAME        nbi
+ENV SERVICE_PASSWORD        nbi
+ENV SERVICE_PROJECT         service
+# ldap
+# ENV LDAP_AUTHENTICATION_DOMAIN_NAME     no default
+# ENV LDAP_URL                            ldap://localhost
+# ENV LDAP_BIND_USER                      no default
+# ENV LDAP_BIND_PASSWORD                  no default
+# ENV LDAP_CHASE_REFERRALS                no default
+# ENV LDAP_PAGE_SIZE                      0
+# ENV LDAP_USER_TREE_DN                   no default
+# ENV LDAP_USER_OBJECTCLASS               inetOrgPerson
+# ENV LDAP_USER_ID_ATTRIBUTE              cn
+# ENV LDAP_USER_NAME_ATTRIBUTE            sn
+# ENV LDAP_USER_PASS_ATTRIBUTE            userPassword
+# ENV LDAP_USER_FILTER                    no default
+# ENV LDAP_USER_ENABLED_ATTRIBUTE         enabled
+# ENV LDAP_USER_ENABLED_MASK              0
+# ENV LDAP_USER_ENABLED_DEFAULT           true
+# ENV LDAP_USER_ENABLED_INVERT            false
+# ENV LDAP_GROUP_OBJECTCLASS              groupOfNames
+# ENV LDAP_GROUP_TREE_DN                  no default
+# ENV LDAP_USE_STARTTLS                   false
+# ENV LDAP_TLS_CACERT_BASE64              no default
+# ENV LDAP_TLS_REQ_CERT                   demand
+
+ENTRYPOINT ["./start.sh"]