From 56e03e471ee38b4ff7b2f045899ede2a7890fdbe Mon Sep 17 00:00:00 2001 From: bravof Date: Wed, 20 Oct 2021 11:48:16 -0300 Subject: [PATCH] Fix bug 1754: update keystone dockerfile to ubuntu 20.04 Change-Id: I79eddf6085d27823ea67561113bdba9593ad6a41 Signed-off-by: bravof Signed-off-by: sousaedu --- docker/Keystone/Dockerfile | 50 ++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/docker/Keystone/Dockerfile b/docker/Keystone/Dockerfile index c3ab344c..44511169 100644 --- a/docker/Keystone/Dockerfile +++ b/docker/Keystone/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2018 Whitestack, LLC +# 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 @@ -13,15 +13,10 @@ # under the License. # # For those usages not covered by the Apache License, Version 2.0 please -# contact: esousa@whitestack.com or glavado@whitestack.com +# contact: fbravo@whitestack.com or glavado@whitestack.com ## -FROM ubuntu:16.04 - -LABEL Maintainer="esousa@whitestack.com" \ - Description="Openstack Keystone Instance" \ - Version="1.0" \ - Author="Eduardo Sousa" +FROM ubuntu:20.04 EXPOSE 5000 @@ -29,18 +24,37 @@ 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:pike && \ - apt-get update && apt dist-upgrade -y && \ - apt-get install -y python-openstackclient keystone apache2 libapache2-mod-wsgi net-tools mysql-client dnsutils && \ - apt-get install -y python-pip build-essential python-dev libldap2-dev libsasl2-dev libssl-dev libffi-dev libxml2-dev libxslt1-dev zlib1g-dev ldap-utils && \ - pip install python-ldap ldappool && \ +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 +RUN pip3 install -U pip==21.3.1 && pip3 install python-ldap==3.2.0 ldappool==3.0.0 + # database ENV DB_HOST keystone-db ENV DB_PORT 3306 @@ -81,4 +95,4 @@ ENV SERVICE_PROJECT service # ENV LDAP_TLS_CACERT_BASE64 no default # ENV LDAP_TLS_REQ_CERT demand -ENTRYPOINT ./start.sh +ENTRYPOINT ["./start.sh"] -- 2.25.1