test

[noissue]
pulp · Aug 20, 2024 · 0cfb0fe · 0cfb0fe
1 parent 3bcaf16
commit 0cfb0fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/images/pulp_ci_centos/Containerfile b/images/pulp_ci_centos/Containerfile
@@ -22,10 +22,10 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=1
 # https://github.com/just-containers/s6-overlay/issues/467
 ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
 
-RUN dnf -y install postgresql && \
-    dnf -y install postgresql-contrib && \
-    dnf -y install postgresql-server && \
-    dnf -y install postgresql-upgrade && \
+RUN dnf -y install postgresql-13.14-1.el9.x86_64 && \
+    dnf -y install postgresql-contrib-13.14-1.el9.x86_64 && \
+    dnf -y install postgresql-server-13.14-1.el9.x86_64 && \
+    dnf -y install postgresql-upgrade-13.14-1.el9.x86_64 && \
     dnf -y install nginx && \
     dnf -y install redis && \
     dnf clean all

diff --git a/images/s6_assets/init/certs b/images/s6_assets/init/certs
@@ -35,8 +35,7 @@ if ! [ -e /etc/pki/tls/certs/pulp_webserver.crt ]; then
   cp /etc/pulp/certs/pulp_webserver.crt /etc/pki/tls/certs/pulp_webserver.crt
   cp /etc/pulp/certs/pulp_webserver.csr /etc/pki/tls/private/pulp_webserver.csr
   cp /etc/pulp/certs/pulp_webserver.key /etc/pki/tls/private/pulp_webserver.key
-  update-ca-trust force-enable
-  update-ca-trust extract
+  update-ca-trust
   cat /etc/pulp/certs/pulp_webserver.crt >> /etc/pki/tls/cert.pem
   echo -e "${PREFIX} ${GREEN}finished adding webserver certificate to the certificate store${ENDCOLOR}"
 fi