From e62662e46359d68a3923df7c95764b439afd7ef3 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 8 Aug 2022 15:50:59 +0200 Subject: [PATCH] Correct entitlements in base Dockerfile --- ci-scripts/cls_containerize.py | 7 ++++--- docker/Dockerfile.base.rhel8.2 | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index edf43cd1bf..e3d5397eee 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -215,9 +215,10 @@ class Containerize(): # if asterix, copy the entitlement and subscription manager configurations if self.host == 'Red Hat': - mySSH.command('mkdir -p tmp/ca/ tmp/entitlement/', '\$', 5) - mySSH.command('sudo cp /etc/rhsm/ca/redhat-uep.pem tmp/ca/', '\$', 5) - mySSH.command('sudo cp /etc/pki/entitlement/*.pem tmp/entitlement/', '\$', 5) + mySSH.command('mkdir -p ./etc-pki-entitlement ./rhsm-conf ./rhsm-ca', '\$', 5) + mySSH.command('sudo cp /etc/rhsm/rhsm.conf ./rhsm-conf/', '\$', 5) + mySSH.command('sudo cp /etc/rhsm/ca/redhat-uep.pem ./rhsm-ca/', '\$', 5) + mySSH.command('sudo cp /etc/pki/entitlement/*.pem ./etc-pki-entitlement/', '\$', 5) baseImage = 'ran-base' baseTag = 'develop' diff --git a/docker/Dockerfile.base.rhel8.2 b/docker/Dockerfile.base.rhel8.2 index 3050f09849..5f897bd0e2 100644 --- a/docker/Dockerfile.base.rhel8.2 +++ b/docker/Dockerfile.base.rhel8.2 @@ -32,8 +32,12 @@ ENV TZ=Europe/Paris ENV BUILD_UHD_FROM_SOURCE=True ENV UHD_VERSION=3.15.0.0 -COPY tmp/ca/redhat-uep.pem /etc/rhsm/ca -COPY tmp/entitlement/*.pem /etc/pki/entitlement +# Copy the entitlements +COPY ./etc-pki-entitlement /etc/pki/entitlement + +# Copy the subscription manager configurations +COPY ./rhsm-conf /etc/rhsm +COPY ./rhsm-ca /etc/rhsm/ca #install developers pkg/repo RUN rm -f /etc/rhsm-host && \