Skip to content
Merged
Changes from all commits
Commits
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
25 changes: 15 additions & 10 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,22 @@ FROM quay.io/crunchtools/ubi10-httpd-php:latest
LABEL maintainer="fatherlinux <[email protected]>"
LABEL description="UBI 10 PHP + PostgreSQL leaf image — requires RHSM for postgresql-server"

# postgresql-server requires RHSM — register, install, unregister in single layer
# postgresql-server requires RHSM — register, install, unregister in ONE layer
# with a trap so unregister+clean run even if the install fails (constitution II).
# The old `&& subscription-manager unregister` chain skipped unregister on any
# install failure, leaking an RHSM consumer as a ghost host in console inventory.
RUN --mount=type=secret,id=RHSM_ACTIVATION_KEY \
--mount=type=secret,id=RHSM_ORG_ID \
subscription-manager register \
--activationkey="$(cat /run/secrets/RHSM_ACTIVATION_KEY)" \
--org="$(cat /run/secrets/RHSM_ORG_ID)" \
&& dnf install -y \
postgresql-server \
php-pgsql \
&& dnf clean all \
&& subscription-manager unregister
--mount=type=secret,id=RHSM_ORG_ID <<'EOF'
set -euo pipefail
subscription-manager register \
--activationkey="$(cat /run/secrets/RHSM_ACTIVATION_KEY)" \
--org="$(cat /run/secrets/RHSM_ORG_ID)"
trap 'subscription-manager unregister || true; subscription-manager clean || true' EXIT
dnf install -y \
postgresql-server \
php-pgsql
dnf clean all
EOF

# Copy init scripts and systemd units
COPY rootfs/ /
Expand Down
Loading