Merge branch 'development' into 'master'

Merge Development into Master

See merge request !46

Dockerfile

-ARG BASE_REGISTRY=registry1.dsop.io
-ARG BASE_IMAGE=ubi8
+ARG BASE_REGISTRY=registry1.dso.mil
+ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
 ARG BASE_TAG=8.4
 FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG
 
@@ -13,14 +13,18 @@ COPY signatures/RPM-GPG-KEY-PGDG-12 \
     postgresql12-server.rpm \
     postgresql12.rpm \
     postgresql12-libs.rpm \
+    postgresql12-contrib.rpm \
     /tmp/
 
 COPY scripts/docker-entrypoint.sh /usr/local/bin/
 
 RUN rpm --import /tmp/RPM-GPG-KEY-PGDG-12 && \
-    dnf install -y glibc-langpack-en /tmp/postgresql12-server.rpm /tmp/postgresql12.rpm /tmp/postgresql12-libs.rpm && \
+    dnf install -y glibc-langpack-en /tmp/postgresql12-server.rpm /tmp/postgresql12.rpm /tmp/postgresql12-libs.rpm /tmp/postgresql12-contrib.rpm && \
     dnf clean all && \
     rm -rf /var/cache/dnf && \
+    rm -rf /usr/share/doc/perl-IO-Socket-SSL/certs/* && \
+    rm -rf /usr/share/doc/perl-IO-Socket-SSL/example && \
+    rm -rf /usr/share/doc/perl-Net-SSLeay/examples && \
     chmod +x /usr/local/bin/docker-entrypoint.sh
 
 RUN mkdir /docker-entrypoint-initdb.d && \

hardening_manifest.yaml

@@ -57,6 +57,11 @@ resources:
   validation:
     type: sha256
     value: 17ccfd37746f5b4175faa3040f5b3497016518ee5a7f3fbbc716862a398fbb2b
+- filename: postgresql12-contrib.rpm
+  url: https://ftp.postgresql.org/pub/repos/yum/12/redhat/rhel-8Server-x86_64/postgresql12-contrib-12.7-2PGDG.rhel8.x86_64.rpm
+  validation:
+    type: sha256
+    value: 7629003db712d51c76be7fd9b745e9ec1fdf64dbf8e11330e85e0a3b06718df8
 
 # List of project maintainers
 # FIXME: Fill in the following details for the current container owner in the whitelist