diff --git a/client-macosx b/client-macosx index 29311508057c4ce4b2ae47a8a0fd0246c5fe3725..1cff882122999727fb738dad8b134da50eb824b6 160000 --- a/client-macosx +++ b/client-macosx @@ -1 +1 @@ -Subproject commit 29311508057c4ce4b2ae47a8a0fd0246c5fe3725 +Subproject commit 1cff882122999727fb738dad8b134da50eb824b6 diff --git a/daemon b/daemon index d89bccf009d83cab23a14f46af44a2f670717440..6bff8561588fb28a4142276a3c25c916ea2e662d 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit d89bccf009d83cab23a14f46af44a2f670717440 +Subproject commit 6bff8561588fb28a4142276a3c25c916ea2e662d diff --git a/docker/Dockerfile_rhel_8 b/docker/Dockerfile_rhel_8 index 9c9ac263d9777f6d89bf5b2e24b024b9eeee3b5f..bab14698061b3c80ecbb5ff6ad88af4e759b1370 100644 --- a/docker/Dockerfile_rhel_8 +++ b/docker/Dockerfile_rhel_8 @@ -1,6 +1,9 @@ FROM docker.io/roboxes/rhel8 -RUN subscription-manager register --username=jamisfl --password=swDO9RBtTocv +ARG PASS +ENV PASS=$PASS + +RUN subscription-manager register --username=jamisfl --password=$PASS RUN subscription-manager attach --auto RUN subscription-manager repos --enable=codeready-builder-for-rhel-8-x86_64-rpms @@ -69,4 +72,3 @@ ADD scripts/build-package-rhel.sh /opt/build-package-rhel.sh CMD /opt/build-package-rhel.sh RUN subscription-manager unregister - diff --git a/lrc b/lrc index 559bbba0a9f632ae554bfe9cfc2edf72efee6b0a..ea8140fc81124b89f3ccc0523b740fe0e8aff289 160000 --- a/lrc +++ b/lrc @@ -1 +1 @@ -Subproject commit 559bbba0a9f632ae554bfe9cfc2edf72efee6b0a +Subproject commit ea8140fc81124b89f3ccc0523b740fe0e8aff289 diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py index f1a6473e15d826b0bf82cf886ec2ffb934e0d7d5..abc07376f43e638e55c598193a4f830041d9cbad 100755 --- a/scripts/make-packaging-target.py +++ b/scripts/make-packaging-target.py @@ -61,7 +61,7 @@ QEMU_STATIC_%(distribution)s: $(PACKAGE_%(distribution)s_DOCKER_IMAGE_FILE): QEMU_STATIC_%(distribution)s docker/Dockerfile_%(docker_image)s docker build \\ -t $(PACKAGE_%(distribution)s_DOCKER_IMAGE_NAME) \\ - -f docker/Dockerfile_%(docker_image)s \\ + -f docker/Dockerfile_%(docker_image)s %(password_rhel8)s \\ $(CURDIR) touch $(PACKAGE_%(distribution)s_DOCKER_IMAGE_FILE) @@ -82,9 +82,11 @@ package-%(distribution)s-interactive: $(RELEASE_TARBALL_FILENAME) packages/%(dis """ -def generate_target(distribution, debian_packaging_override, output_file, options='', docker_image='', version='', qemu_static=''): +def generate_target(distribution, debian_packaging_override, output_file, options='', docker_image='', version='', qemu_static='', password_rhel8 = ''): if (docker_image == ''): docker_image = distribution + if (docker_image == 'rhel_8'): + password_rhel8 = password_rhel8 if (version == ''): version = "$(DEBIAN_VERSION)" return target_template % { @@ -95,6 +97,7 @@ def generate_target(distribution, debian_packaging_override, output_file, option "options": options, "version": version, "qemu_static": qemu_static, + "password_rhel8": password_rhel8, } @@ -462,6 +465,7 @@ def run_generate_all(parsed_args): "debian_packaging_override": "", "output_file": ".packages-built", "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged", + "password_rhel8": "--build-arg PASS=${PASS}" }, #opensuse_leap {