Merge pull request #652 from mdellweg/install_storages

Install storage libraries
pulp · Jul 18, 2024 · 8943b86 · 8943b86
2 parents 26eefd4 + 8174667
commit 8943b86
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 7 deletions.
diff --git a/images/galaxy-minimal/nightly/Containerfile.core b/images/galaxy-minimal/nightly/Containerfile.core
@@ -1,7 +1,9 @@
 ARG FROM_TAG="latest"
 FROM pulp/base:${FROM_TAG}
 
-RUN pip3 install git+https://github.com/ansible/galaxy_ng \
+RUN pip3 install \
+  git+https://github.com/ansible/galaxy_ng \
+  pulpcore[s3] \
   -c /constraints.txt && \
   rm -rf /root/.cache/pip
 

diff --git a/images/galaxy-minimal/stable/Containerfile.core b/images/galaxy-minimal/stable/Containerfile.core
@@ -6,7 +6,7 @@ ARG GALAXY_NG_VERSION=""
 
 RUN pip3 install --upgrade \
   galaxy-ng${GALAXY_NG_VERSION} \
-  pulpcore${PULPCORE_VERSION} \
+  pulpcore[s3]${PULPCORE_VERSION} \
   -c /constraints.txt && \
   rm -rf /root/.cache/pip
 

diff --git a/images/galaxy/nightly/Containerfile b/images/galaxy/nightly/Containerfile
@@ -5,6 +5,7 @@ ARG GALAXY_NG_VERSION=""
 
 RUN pip3 install --upgrade \
   git+https://github.com/ansible/galaxy_ng.git@master \
+  pulpcore[s3] \
   requests \
   -c /constraints.txt && \
   rm -rf /root/.cache/pip

diff --git a/images/galaxy/stable/Containerfile b/images/galaxy/stable/Containerfile
@@ -6,7 +6,7 @@ ARG GALAXY_NG_VERSION=""
 
 RUN pip3 install --upgrade \
   galaxy-ng${GALAXY_NG_VERSION} \
-  pulpcore${PULPCORE_VERSION} \
+  pulpcore[s3]${PULPCORE_VERSION} \
   requests \
   -c /constraints.txt && \
   rm -rf /root/.cache/pip

diff --git a/images/pulp-minimal/nightly/Containerfile.core b/images/pulp-minimal/nightly/Containerfile.core
@@ -1,7 +1,8 @@
 ARG FROM_TAG="latest"
 FROM pulp/base:${FROM_TAG}
 
-RUN pip3 install git+https://github.com/pulp/pulpcore.git#egg=pulpcore \
+RUN pip3 install \
+  pulpcore[s3,google,azure]@git+https://github.com/pulp/pulpcore.git#egg=pulpcore \
   git+https://github.com/pulp/pulp_ansible.git \
   git+https://github.com/pulp/pulp-certguard.git \
   git+https://github.com/pulp/pulp_container.git \

diff --git a/images/pulp-minimal/stable/Containerfile.core b/images/pulp-minimal/stable/Containerfile.core
@@ -13,7 +13,7 @@ ARG PULP_RPM_VERSION=""
 ARG PULP_OSTREE_VERSION=""
 
 RUN pip3 install --upgrade \
-  pulpcore${PULPCORE_VERSION} \
+  pulpcore[s3,google,azure]${PULPCORE_VERSION} \
   pulp-ansible${PULP_ANSIBLE_VERSION} \
   pulp-certguard${PULP_CERTGUARD_VERSION} \
   pulp-container${PULP_CONTAINER_VERSION} \

diff --git a/images/pulp/nightly/Containerfile b/images/pulp/nightly/Containerfile
@@ -2,7 +2,7 @@ ARG FROM_TAG="latest"
 FROM pulp/pulp-ci-centos9:${FROM_TAG}
 
 RUN pip3 install --upgrade \
-  git+https://github.com/pulp/pulpcore@main \
+  pulpcore[s3,google,azure]@git+https://github.com/pulp/pulpcore@main \
   git+https://github.com/pulp/pulp_ansible@main \
   git+https://github.com/pulp/pulp-certguard@main \
   git+https://github.com/pulp/pulp_container@main \

diff --git a/images/pulp/stable/Containerfile b/images/pulp/stable/Containerfile
@@ -14,7 +14,7 @@ ARG PULP_RPM_VERSION=""
 ARG PULP_OSTREE_VERSION=""
 
 RUN pip3 install --upgrade \
-  pulpcore${PULPCORE_VERSION} \
+  pulpcore[s3,google,azure]${PULPCORE_VERSION} \
   pulp-ansible${PULP_ANSIBLE_VERSION} \
   pulp-certguard${PULP_CERTGUARD_VERSION} \
   pulp-container${PULP_CONTAINER_VERSION} \