Addtl fixes

[noissue]

images/Containerfile.core.base

@@ -90,9 +90,9 @@ RUN sed 's|^#mount_program|mount_program|g' -i /etc/containers/storage.conf
 # We modified the example so that we have a UID range of upto 65535.
 # Because, for example, the image docker.io/library/busybox actually uses the user nobody(65534) for
 # /home rather than the traditional nobody/nfsnbody usage (not an owner on a permanent filesystem.)
-# This does however mean that a user must have a UID range for the pulp container of at least 75536
-# large, contrary to many examples out there that are only 65536 large.
-RUN usermod --add-subuids 10000-75535 --add-subgids 10000-75535 pulp
+# This does however mean that a user must have a UID range for the pulp container of at least 75535
+# large (UID 0 is in addition), contrary to many examples out there that are only 65536 large.
+RUN usermod --add-subuids 10000-75534 --add-subgids 10000-75534 pulp
 VOLUME /var/lib/containers
 RUN mkdir -p /var/lib/pulp/.local/share/containers && chown -R pulp:pulp /var/lib/pulp/.local
 VOLUME /var/lib/pulp/.local/share/containers

images/s6_assets/pulp_tests.sh

@@ -53,6 +53,7 @@ podman exec -u pulp pulp chmod a+rx /var/lib/pulp/scripts/sign_deb_release.sh
 podman exec -u pulp pulp bash -c "pulpcore-manager add-signing-service --class deb:AptReleaseSigningService sign_deb_release /var/lib/pulp/scripts/sign_deb_release.sh 'Pulp QE'"
 
 # Test buildah for pulp_container's usage
+#podman exec -u pulp pulp podman system migrate
 podman exec -u pulp pulp podman build https://github.com/openshift-examples/web.git
 # Test skopeo for pulp_container's usage with an image with the nobody uid 65534
 # (And the image that pulp_container CI actually tests with)