UNCLASSIFIED

Commit 252fca13 authored by Jeffrey Weatherford's avatar Jeffrey Weatherford
Browse files

Merge branch 'jharv_hardening' into 'development'

A few fixes (scanning failures and correctness)

See merge request !3
parents c3e5b801 26745e96
Pipeline #460087 canceled with stages
in 6 seconds
ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.3 ARG BASE_TAG=8.4
FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG
MAINTAINER Crunchy Data <info@crunchydata.com> MAINTAINER Crunchy Data <info@crunchydata.com>
...@@ -63,4 +63,4 @@ ENTRYPOINT ["/opt/crunchy/bin/uid_postgres.sh"] ...@@ -63,4 +63,4 @@ ENTRYPOINT ["/opt/crunchy/bin/uid_postgres.sh"]
USER 26 USER 26
CMD ["/opt/crunchy/bin/start.sh"] CMD ["/opt/crunchy/bin/start.sh"]
\ No newline at end of file
...@@ -2230,30 +2230,6 @@ resources: ...@@ -2230,30 +2230,6 @@ resources:
type: sha256 type: sha256
value: dffc8ca60da043a118fd13dbea1e585d82b9be8750b4acb7a959f641950db838 value: dffc8ca60da043a118fd13dbea1e585d82b9be8750b4acb7a959f641950db838
- filename: grub2-common-2.02-99.el8.noarch.rpm
url: http://mirror.centos.org/centos-8/8.4.2105/BaseOS/x86_64/os/Packages//grub2-common-2.02-99.el8.noarch.rpm
validation:
type: sha256
value: 4a08d5264e865548e65d31886c91b659b33a2c2ba39fd115b00af3ea0bc91a83
- filename: grub2-tools-2.02-99.el8.x86_64.rpm
url: http://mirror.centos.org/centos-8/8.4.2105/BaseOS/x86_64/os/Packages//grub2-tools-2.02-99.el8.x86_64.rpm
validation:
type: sha256
value: ffb306f226bf9b8b97ecc2ee4fc298cb016d459d2f3847144e065fbb30e60698
- filename: grub2-tools-minimal-2.02-99.el8.x86_64.rpm
url: http://mirror.centos.org/centos-8/8.4.2105/BaseOS/x86_64/os/Packages//grub2-tools-minimal-2.02-99.el8.x86_64.rpm
validation:
type: sha256
value: a7ae26b282cff8289a4bd20ee9683bc87e9f6a4c7d7ffce839f2d8a9d46c5734
- filename: grubby-8.40-41.el8.x86_64.rpm
url: http://mirror.centos.org/centos-8/8.4.2105/BaseOS/x86_64/os/Packages//grubby-8.40-41.el8.x86_64.rpm
validation:
type: sha256
value: 188c15ed6c943e47dd53002c2a2275b6c2a465db7901dcedbfaef225c607e64b
- filename: libgudev-232-4.el8.x86_64.rpm - filename: libgudev-232-4.el8.x86_64.rpm
url: http://mirror.centos.org/centos-8/8.4.2105/BaseOS/x86_64/os/Packages//libgudev-232-4.el8.x86_64.rpm url: http://mirror.centos.org/centos-8/8.4.2105/BaseOS/x86_64/os/Packages//libgudev-232-4.el8.x86_64.rpm
validation: validation:
...@@ -2266,24 +2242,12 @@ resources: ...@@ -2266,24 +2242,12 @@ resources:
type: sha256 type: sha256
value: aa8d1f77e2afea5018f4df761a5cffe7ab70e341e51cbf4c57ea53233b081ffc value: aa8d1f77e2afea5018f4df761a5cffe7ab70e341e51cbf4c57ea53233b081ffc
- filename: memstrack-0.1.11-1.el8.x86_64.rpm
url: http://mirror.centos.org/centos-8/8.4.2105/BaseOS/x86_64/os/Packages//memstrack-0.1.11-1.el8.x86_64.rpm
validation:
type: sha256
value: efac6a249e1ab6e6e586db6d1f16c22c299667f464874a9612e280945077bf53
- filename: openssh-server-8.0p1-6.el8_4.2.x86_64.rpm - filename: openssh-server-8.0p1-6.el8_4.2.x86_64.rpm
url: http://mirror.centos.org/centos-8/8.4.2105/BaseOS/x86_64/os/Packages//openssh-server-8.0p1-6.el8_4.2.x86_64.rpm url: http://mirror.centos.org/centos-8/8.4.2105/BaseOS/x86_64/os/Packages//openssh-server-8.0p1-6.el8_4.2.x86_64.rpm
validation: validation:
type: sha256 type: sha256
value: 12cf61cf5893a095ef8d693dc8e9b4bdb26eacb31c2075d831b06d0b5ecdd13e value: 12cf61cf5893a095ef8d693dc8e9b4bdb26eacb31c2075d831b06d0b5ecdd13e
- filename: os-prober-1.74-6.el8.x86_64.rpm
url: http://mirror.centos.org/centos-8/8.4.2105/BaseOS/x86_64/os/Packages//os-prober-1.74-6.el8.x86_64.rpm
validation:
type: sha256
value: 91eb3bdf183ca4211207f1691be56b036d07442b421981fcf2a4a37c8b52b0f2
- filename: blas-3.8.0-8.el8.x86_64.rpm - filename: blas-3.8.0-8.el8.x86_64.rpm
url: http://mirror.centos.org/centos-8/8.4.2105/AppStream/x86_64/os/Packages//blas-3.8.0-8.el8.x86_64.rpm url: http://mirror.centos.org/centos-8/8.4.2105/AppStream/x86_64/os/Packages//blas-3.8.0-8.el8.x86_64.rpm
validation: validation:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment