Skip to content

ROX-10613: Use ubi-minimal for scanner-db #956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Oct 26, 2022
Merged

ROX-10613: Use ubi-minimal for scanner-db #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f1de8ec
ROX-10613: Use ubi-minimal for scanner-db
janisz Oct 4, 2022
cee2ecb
Make it similar to scanner
janisz Oct 4, 2022
9db2b25
Copy changes to slim
janisz Oct 4, 2022
54730db
Add flags to curl
janisz Oct 5, 2022
fecd31b
Reinstall tzdata
janisz Oct 5, 2022
cecca48
Fix for ARM
janisz Oct 5, 2022
9c4a2cb
run upgrade first
janisz Oct 6, 2022
527c22a
Fixes for arm
janisz Oct 6, 2022
d3dc961
Fix
janisz Oct 6, 2022
3ce6310
Workaround for aarch64
janisz Oct 6, 2022
71d4228
Update image/db/rhel/Dockerfile
janisz Oct 6, 2022
2708327
Update image/db/rhel/Dockerfile.slim
janisz Oct 6, 2022
00fc642
Add comment
janisz Oct 10, 2022
5b6b31e
Import pg repo key
janisz Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions image/db/rhel/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ARG BASE_REGISTRY=registry.access.redhat.com
ARG BASE_IMAGE=ubi8/ubi
ARG BASE_IMAGE=ubi8-minimal
ARG BASE_TAG=8.6

FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS extracted_bundle
COPY bundle.tar.gz /

WORKDIR /bundle
RUN tar -xzf /bundle.tar.gz
RUN microdnf -y install tar gzip && tar -zxf /bundle.tar.gz

FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS base

Expand All @@ -25,18 +25,30 @@ COPY --from=extracted_bundle /bundle/etc/postgresql.conf /bundle/etc/pg_hba.conf

ARG POSTGRESQL_ARCH=x86_64

RUN groupadd -g 70 postgres && \
RUN curl -sSLf https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-${PG_MAJOR} -o /tmp/pg_repo.key && \
rpm --import /tmp/pg_repo.key && \
curl -sSLf https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-${POSTGRESQL_ARCH}/pgdg-redhat-repo-latest.noarch.rpm -o /tmp/pg_repo.rpm && \
rpm -i /tmp/pg_repo.rpm && \
# Skip repo check for ARM as it's used only for development purposes and package has wrong signature.
if [[ "$POSTGRESQL_ARCH" == "aarch64" ]]; then sed -i 's/repo_gpgcheck = 1/repo_gpgcheck = 0/g' /etc/yum.repos.d/pgdg-redhat-all.repo; fi && \
microdnf upgrade -y && \
microdnf install -y shadow-utils && \
groupadd -g 70 postgres && \
adduser postgres -u 70 -g 70 -d /var/lib/postgresql -s /bin/sh && \
dnf upgrade -y && \
dnf install -y \
microdnf install -y \
ca-certificates libicu systemd-sysv glibc-locale-source glibc-langpack-en \
https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-${POSTGRESQL_ARCH}/pgdg-redhat-repo-latest.noarch.rpm && \
dnf install -y postgresql12-server && \
dnf clean all && \
postgresql12-server && \
# The removal of /usr/share/zoneinfo from UBI minimal images is intentional.
# After building the image, the image is reduced in size as much as possible,
# and the /usr/share/zoneinfo directory is purged as it saves space
# in the final distribution of the image.
# https://access.redhat.com/solutions/5616681
microdnf reinstall tzdata && \
microdnf clean all && \
rpm -e --nodeps $(rpm -qa 'pgdg-redhat-repo*') && \
# (Optional) Remove line below to keep package management utilities
rpm -e --nodeps $(rpm -qa curl '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*') && \
rm -rf /var/cache/dnf /var/cache/yum && \
rpm -e --nodeps $(rpm -qa shadow-utils curl '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*') && \
rm -rf /var/cache/dnf /var/cache/yum /tmp/pg_repo.rpm /tmp/pg_repo.key && \
localedef -f UTF-8 -i en_US en_US.UTF-8 && \
chown postgres:postgres /usr/local/bin/docker-entrypoint.sh && \
chmod +x /usr/local/bin/docker-entrypoint.sh && \
Expand Down
32 changes: 22 additions & 10 deletions image/db/rhel/Dockerfile.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ARG BASE_REGISTRY=registry.access.redhat.com
ARG BASE_IMAGE=ubi8/ubi
ARG BASE_IMAGE=ubi8-minimal
ARG BASE_TAG=8.6

FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS extracted_bundle
COPY bundle.tar.gz /

WORKDIR /bundle
RUN tar -xzf /bundle.tar.gz
RUN microdnf -y install tar gzip && tar -zxf /bundle.tar.gz

FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS base

Expand All @@ -25,18 +25,30 @@ COPY --from=extracted_bundle /bundle/etc/postgresql.conf /bundle/etc/pg_hba.conf

ARG POSTGRESQL_ARCH=x86_64

RUN groupadd -g 70 postgres && \
RUN curl -sSLf https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-${PG_MAJOR} -o /tmp/pg_repo.key && \
rpm --import /tmp/pg_repo.key && \
curl -sSLf https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-${POSTGRESQL_ARCH}/pgdg-redhat-repo-latest.noarch.rpm -o /tmp/pg_repo.rpm && \
rpm -i /tmp/pg_repo.rpm && \
# Skip repo check for ARM as it's used only for development purposes and package has wrong signature.
if [[ "$POSTGRESQL_ARCH" == "aarch64" ]]; then sed -i 's/repo_gpgcheck = 1/repo_gpgcheck = 0/g' /etc/yum.repos.d/pgdg-redhat-all.repo; fi && \
microdnf upgrade -y && \
microdnf install -y shadow-utils && \
groupadd -g 70 postgres && \
adduser postgres -u 70 -g 70 -d /var/lib/postgresql -s /bin/sh && \
dnf upgrade -y && \
dnf install -y \
microdnf install -y \
ca-certificates libicu systemd-sysv glibc-locale-source glibc-langpack-en \
https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-${POSTGRESQL_ARCH}/pgdg-redhat-repo-latest.noarch.rpm && \
dnf install -y postgresql12-server && \
dnf clean all && \
postgresql12-server && \
# The removal of /usr/share/zoneinfo from UBI minimal images is intentional.
# After building the image, the image is reduced in size as much as possible,
# and the /usr/share/zoneinfo directory is purged as it saves space
# in the final distribution of the image.
# https://access.redhat.com/solutions/5616681
microdnf reinstall tzdata && \
microdnf clean all && \
rpm -e --nodeps $(rpm -qa 'pgdg-redhat-repo*') && \
# (Optional) Remove line below to keep package management utilities
rpm -e --nodeps $(rpm -qa curl '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*') && \
rm -rf /var/cache/dnf /var/cache/yum && \
rpm -e --nodeps $(rpm -qa shadow-utils curl '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*') && \
rm -rf /var/cache/dnf /var/cache/yum /tmp/pg_repo.rpm /tmp/pg_repo.key && \
localedef -f UTF-8 -i en_US en_US.UTF-8 && \
chown postgres:postgres /usr/local/bin/docker-entrypoint.sh && \
chmod +x /usr/local/bin/docker-entrypoint.sh && \
Expand Down