Merge pull request #192 from telefonicaid/fix/epel_dep

fix missed deps using epel 7-14
telefonicaid · Oct 29, 2021 · 24c9ee4 · 24c9ee4
2 parents 4a177ff + c3b1799
commit 24c9ee4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,4 @@
+Fix missed deps (python2-qpid-proton, qpid-proton-c) using epel version 7-14
 Remove old framework files
 Remove some reduntant logs (flask, stevedore, oslo_policy) docker container
 

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -9,6 +9,7 @@ ENV KEYSTONE_SPASSWORD_VERSION 1.12.0
 
 COPY ./*.sh /opt/keystone/
 COPY ./*.patch /opt/keystone/
+COPY ./*.rpm /opt/keystone/
 COPY ./keystone-all /opt/keystone/
 
 WORKDIR /opt/keystone
@@ -17,6 +18,8 @@ RUN \
     # Install dependencies
     yum update -y && yum install -y curl && \
     yum install -y epel-release && yum update -y epel-release && \
+    yum localinstall -y --nogpgcheck qpid-proton-c-0.34.0-2.el7.x86_64.rpm && \
+    yum localinstall -y --nogpgcheck python2-qpid-proton-0.34.0-2.el7.x86_64.rpm && \
     # Install MySQL client
     yum -y install mysql git && \
     # Install keystone dependencies

diff --git a/docker/python2-qpid-proton-0.34.0-2.el7.x86_64.rpm b/docker/python2-qpid-proton-0.34.0-2.el7.x86_64.rpm
diff --git a/docker/qpid-proton-c-0.34.0-2.el7.x86_64.rpm b/docker/qpid-proton-c-0.34.0-2.el7.x86_64.rpm