s

fauust · Sep 27, 2023 · c8f5714 · c8f5714
1 parent 76aed03
commit c8f5714
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/bb_containers_rhel.yml b/.github/workflows/bb_containers_rhel.yml
@@ -75,12 +75,14 @@ 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: |
+          CURRENT_USER=$(whoami)
+          sudo loginctl enable-linger $(id -u $CURRENT_USER)
       - name: Build image
         run: |
           # //TEMP need probably a cleaning step at the end
-          if [[ -d /home/runner/.local/share/containers ]]; then
-            sudo rm -rf /home/runner/.local/share/containers
+          if [[ -d $HOME/.local/share/containers ]]; then
+            sudo rm -rf $HOME/.local/share/containers
           fi
           # create secrets
           echo "${{ secrets.RHEL_ORGID }}" >rhel_orgid

diff --git a/ci_build_images/rhel.Dockerfile b/ci_build_images/rhel.Dockerfile
@@ -24,7 +24,7 @@ RUN --mount=type=secret,id=rhel_orgid,target=/run/secrets/rhel_orgid \
       # no buildbot-worker any more \
       extra="fmt-devel python3-pip"; \
       if [ "$(arch)" == "x86_64" ] || [ "$(arch)" == "ppc64le" ]; then \
-         extra="$extra libpmem-devel dumb-init"; \
+         extra="$extra libpmem-devel"; \
       fi \
       ;; \
     ubi8) \
@@ -34,12 +34,9 @@ RUN --mount=type=secret,id=rhel_orgid,target=/run/secrets/rhel_orgid \
       if [ "$(arch)" == "x86_64" ]; then \
          extra="$extra libpmem-devel"; \
       fi; \
-      # dumb-init rpm is not available on rhel8 \
-      curl -sL "https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_$(uname -m)" >/usr/local/bin/dumb-init; \
-      chmod +x /usr/local/bin/dumb-init; \
       # rhel8 need a specific Judy(-devel) pkg \
-      dnf -y install "https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Everything/$(arch)/os/Packages/j/Judy-1.0.5-31.fc38.$(arch).rpm"; \
-      dnf -y install "https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Everything/$(arch)/os/Packages/j/Judy-devel-1.0.5-31.fc38.$(arch).rpm"; \
+      dnf -y install "https://kojipkgs.fedoraproject.org/packages/Judy/1.0.5/31.fc38/$(arch)/Judy-1.0.5-31.fc38.$(arch).rpm"; \
+      dnf -y install "https://kojipkgs.fedoraproject.org/packages/Judy/1.0.5/31.fc38/$(arch)/Judy-devel-1.0.5-31.fc38.$(arch).rpm"; \
       ;; \
     esac \
     && subscription-manager repos --enable "codeready-builder-for-rhel-${v}-$(uname -m)-rpms" \
@@ -95,6 +92,10 @@ RUN --mount=type=secret,id=rhel_orgid,target=/run/secrets/rhel_orgid \
     wget \
     xz-devel \
     yum-utils \
-    && dnf clean all
+    && dnf clean all \
+    && subscription-manager unregister \
+    # dumb-init rpm is not available on rhel \
+    && curl -sL "https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_$(uname -m)" >/usr/local/bin/dumb-init \
+    && chmod +x /usr/local/bin/dumb-init
 
 ENV WSREP_PROVIDER=/usr/lib64/galera/libgalera_smm.so