From 68efd3cb3af7e001babd1a2060296d34cc64bee1 Mon Sep 17 00:00:00 2001 From: Gerrod Ubben Date: Tue, 1 Aug 2023 10:17:48 -0400 Subject: [PATCH 1/2] Fix 3.23 version pin [noissue] --- images/pulp-minimal/stable/Containerfile.core | 2 +- images/pulp/stable/Containerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/pulp-minimal/stable/Containerfile.core b/images/pulp-minimal/stable/Containerfile.core index ec2dca1e..7fa0adbd 100644 --- a/images/pulp-minimal/stable/Containerfile.core +++ b/images/pulp-minimal/stable/Containerfile.core @@ -1,7 +1,7 @@ ARG FROM_TAG="latest" FROM pulp/base:${FROM_TAG} -ARG PULPCORE_VERSION="~=3.23" +ARG PULPCORE_VERSION="~=3.23.0" ARG PULP_ANSIBLE_VERSION="" ARG PULP_CERTGUARD_VERSION="" ARG PULP_CONTAINER_VERSION="" diff --git a/images/pulp/stable/Containerfile b/images/pulp/stable/Containerfile index 4359046a..2c9bc5cb 100644 --- a/images/pulp/stable/Containerfile +++ b/images/pulp/stable/Containerfile @@ -1,7 +1,7 @@ ARG FROM_TAG="latest" FROM pulp/pulp-ci-centos:${FROM_TAG} -ARG PULPCORE_VERSION="~=3.23" +ARG PULPCORE_VERSION="~=3.23.0" ARG PULP_ANSIBLE_VERSION="" ARG PULP_CERTGUARD_VERSION="" ARG PULP_CONTAINER_VERSION="" From 01320f7d61cd02f94206b57ba2781e6e5cda9005 Mon Sep 17 00:00:00 2001 From: Gerrod Ubben Date: Tue, 1 Aug 2023 11:32:09 -0400 Subject: [PATCH 2/2] Fix galaxy install [noissue] --- images/galaxy-minimal/stable/Containerfile.core | 4 ++-- images/galaxy/nightly/Containerfile | 4 ++-- images/galaxy/stable/Containerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/galaxy-minimal/stable/Containerfile.core b/images/galaxy-minimal/stable/Containerfile.core index 81c69df4..c68a76b0 100644 --- a/images/galaxy-minimal/stable/Containerfile.core +++ b/images/galaxy-minimal/stable/Containerfile.core @@ -5,8 +5,8 @@ ARG PULPCORE_VERSION="" ARG GALAXY_NG_VERSION="" RUN pip3 install --upgrade \ - pulpcore${PULPCORE_VERSION} \ - galaxy-ng${GALAXY_NG_VERSION} && \ + galaxy-ng${GALAXY_NG_VERSION} \ + pulpcore${PULPCORE_VERSION} && \ rm -rf /root/.cache/pip USER pulp:pulp diff --git a/images/galaxy/nightly/Containerfile b/images/galaxy/nightly/Containerfile index 7e00af23..197dc5be 100644 --- a/images/galaxy/nightly/Containerfile +++ b/images/galaxy/nightly/Containerfile @@ -4,8 +4,8 @@ FROM pulp/pulp-ci-centos:${FROM_TAG} ARG GALAXY_NG_VERSION="" RUN pip3 install --upgrade \ - requests \ - git+https://github.com/ansible/galaxy_ng.git@master && \ + git+https://github.com/ansible/galaxy_ng.git@master \ + requests && \ rm -rf /root/.cache/pip USER pulp:pulp diff --git a/images/galaxy/stable/Containerfile b/images/galaxy/stable/Containerfile index bdbbd926..c3d38418 100644 --- a/images/galaxy/stable/Containerfile +++ b/images/galaxy/stable/Containerfile @@ -5,9 +5,9 @@ ARG PULPCORE_VERSION="" ARG GALAXY_NG_VERSION="" RUN pip3 install --upgrade \ - requests \ + galaxy-ng${GALAXY_NG_VERSION} \ pulpcore${PULPCORE_VERSION} \ - galaxy-ng${GALAXY_NG_VERSION} && \ + requests && \ rm -rf /root/.cache/pip USER pulp:pulp