Merge pull request #529 from gerrod3/fix-3.23

Fix 3.23 version pin
pulp · Aug 1, 2023 · 22677e4 · 22677e4
2 parents 69f3505 + 01320f7
commit 22677e4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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

diff --git 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
@@ -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=""