s

fauust · Sep 22, 2023 · a04bb0b · a04bb0b
1 parent f801917
commit a04bb0b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/.github/workflows/bb_containers_rhel.yml b/.github/workflows/bb_containers_rhel.yml
@@ -65,7 +65,7 @@ jobs:
         run: |
           docker run -i -v $(pwd):/mnt -w /mnt ghcr.io/hadolint/hadolint:latest hadolint /mnt/Dockerfile
       - name: Enable Systemd session for cgroupv2
-        run: sudo loginctl enable-linger $(id -u runner)
+        run: loginctl enable-linger $(whoami)
       - name: Build image
         run: |
           # //TEMP need probably a cleaning step at the end

diff --git a/ci_build_images/rhel.Dockerfile b/ci_build_images/rhel.Dockerfile
@@ -12,13 +12,7 @@ LABEL maintainer="MariaDB Buildbot maintainers"
 # see: https://access.redhat.com/discussions/5889431 for rhsm/config.py hack.
 ENV SMDEV_CONTAINER_OFF=1
 # hadolint ignore=SC2034,DL3041,SC2086
-RUN --mount=type=secret,id=rhel_orgid,target=/run/secrets/rhel_orgid \
-    --mount=type=secret,id=rhel_keyname,target=/run/secrets/rhel_keyname \
-    sed -i 's/\(def in_container():\)/\1\n    return False/g' /usr/lib64/python*/*-packages/rhsm/config.py \
-    && subscription-manager register \
-         --org="$(cat /run/secrets/rhel_orgid)" \
-         --activationkey="$(cat /run/secrets/rhel_keyname)" \
-    && case $base_image in \
+RUN case $base_image in \
     ubi9) \
       v=9; \
       # no buildbot-worker any more \

diff --git a/ci_build_images/rhel7.Dockerfile b/ci_build_images/rhel7.Dockerfile
@@ -8,13 +8,7 @@ FROM registry.access.redhat.com/$base_image
 LABEL maintainer="MariaDB Buildbot maintainers"
 
 # Install updates and required packages
-RUN --mount=type=secret,id=rhel_orgid,target=/run/secrets/rhel_orgid \
-    --mount=type=secret,id=rhel_keyname,target=/run/secrets/rhel_keyname \
-    sed -i 's/\(def in_container():\)/\1\n    return False/g' /usr/lib64/python*/*-packages/rhsm/config.py \
-    && subscription-manager register \
-         --org="$(cat /run/secrets/rhel_orgid)" \
-         --activationkey="$(cat /run/secrets/rhel_keyname)" \
-    && subscription-manager repos --enable=rhel-7-server-optional-rpms \
+RUN subscription-manager repos --enable=rhel-7-server-optional-rpms \
     && rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
     && yum -y upgrade \
     && yum-builddep -y mariadb-server \