From 8174667d9cfb2f6341115187575f338302113697 Mon Sep 17 00:00:00 2001
From: Matthias Dellweg <mdellweg@redhat.com>
Date: Thu, 18 Jul 2024 20:24:33 +0200
Subject: [PATCH] Install storage libraries

[noissue]
---
 images/galaxy-minimal/nightly/Containerfile.core | 4 +++-
 images/galaxy-minimal/stable/Containerfile.core  | 2 +-
 images/galaxy/nightly/Containerfile              | 1 +
 images/galaxy/stable/Containerfile               | 2 +-
 images/pulp-minimal/nightly/Containerfile.core   | 3 ++-
 images/pulp-minimal/stable/Containerfile.core    | 2 +-
 images/pulp/nightly/Containerfile                | 2 +-
 images/pulp/stable/Containerfile                 | 2 +-
 8 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/images/galaxy-minimal/nightly/Containerfile.core b/images/galaxy-minimal/nightly/Containerfile.core
index 0036c0f7..76be60c0 100644
--- 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
index 21e6284a..9a8a75d5 100644
--- 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
index 1013de08..87259b20 100644
--- 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
index 96b43106..5a768ea1 100644
--- 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
index 8fffb094..d19c6759 100644
--- 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
index a5d3e7c9..f7e7b34b 100644
--- 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
index 3828ab33..89b76c1d 100644
--- 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
index a65d3dea..dc53dbbd 100644
--- 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} \