From 364c0e397d6357a4f8124b5938dbd187cc7725b8 Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@redhat.com>
Date: Thu, 16 Nov 2023 11:22:27 -0500
Subject: [PATCH] Limit podman-compose to 1.0.3

Similar to how Ubuntu 22.04 has podman 3.4.4
from Dec 2021 also.

Fixes "error generating dependency graph for container"

[noissue]
---
 .github/workflows/pulp_images.yml  | 5 ++++-
 images/compose/compose.folders.yml | 8 ++++----
 images/compose/compose.yml         | 8 ++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/pulp_images.yml b/.github/workflows/pulp_images.yml
index b7da28a2..54a23bab 100644
--- a/.github/workflows/pulp_images.yml
+++ b/.github/workflows/pulp_images.yml
@@ -203,7 +203,10 @@ jobs:
           echo "Working around https://bugs.launchpad.net/ubuntu/+source/libpod/+bug/2024394"
           curl -O http://archive.ubuntu.com/ubuntu/pool/universe/g/golang-github-containernetworking-plugins/containernetworking-plugins_1.1.1+ds1-3_amd64.deb
           sudo dpkg -i containernetworking-plugins_1.1.1+ds1-3_amd64.deb
-          pip install httpie podman-compose
+          # Ubuntu 22.04 has old podman 3.4.4, we need podman-compose==1.0.3 to avoid an
+          # error with dependency contianers not being detected as running.
+          # "error generating dependency graph for container"
+          pip install httpie podman-compose==1.0.3
         shell: bash
 
       - name: Build images
diff --git a/images/compose/compose.folders.yml b/images/compose/compose.folders.yml
index 99eff624..b2a8a9e2 100644
--- a/images/compose/compose.folders.yml
+++ b/images/compose/compose.folders.yml
@@ -15,7 +15,7 @@ services:
       - "./assets/postgres/passwd:/etc/passwd:Z"
     restart: always
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U pulp" ]
+      test: pg_isready -U pulp
       interval: 10s
       timeout: 5s
       retries: 5
@@ -26,7 +26,7 @@ services:
       - "redis_data:/data"
     restart: always
     healthcheck:
-      test: [ "CMD-SHELL", "redis-cli ping" ]
+      test: redis-cli ping
       interval: 10s
       timeout: 5s
       retries: 5
@@ -107,7 +107,7 @@ services:
       - "../../pulp_storage:/var/lib/pulp:z"
     restart: always
     healthcheck:
-      test: [ "CMD-SHELL", "readyz.py /pulp/api/v3/status/" ]
+      test: readyz.py /pulp/api/v3/status/
       interval: 10s
       timeout: 5s
       retries: 5
@@ -132,7 +132,7 @@ services:
       - "../../pulp_storage:/var/lib/pulp:z"
     restart: always
     healthcheck:
-      test: [ "CMD-SHELL", "readyz.py /pulp/content/" ]
+      test: readyz.py /pulp/content
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/images/compose/compose.yml b/images/compose/compose.yml
index e802e8bc..6a57a298 100644
--- a/images/compose/compose.yml
+++ b/images/compose/compose.yml
@@ -15,7 +15,7 @@ services:
       - "./assets/postgres/passwd:/etc/passwd:Z"
     restart: always
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U pulp" ]
+      test: pg_isready -U pulp
       interval: 10s
       timeout: 5s
       retries: 5
@@ -26,7 +26,7 @@ services:
       - "redis_data:/data"
     restart: always
     healthcheck:
-      test: [ "CMD-SHELL", "redis-cli ping" ]
+      test: redis-cli ping
       interval: 10s
       timeout: 5s
       retries: 5
@@ -109,7 +109,7 @@ services:
       - "pulp:/var/lib/pulp"
     restart: always
     healthcheck:
-      test: [ "CMD-SHELL", "readyz.py /pulp/api/v3/status/" ]
+      test: readyz.py /pulp/api/v3/status/
       interval: 10s
       timeout: 5s
       retries: 5
@@ -134,7 +134,7 @@ services:
       - "pulp:/var/lib/pulp"
     restart: always
     healthcheck:
-      test: [ "CMD-SHELL", "readyz.py /pulp/content/" ]
+      test: readyz.py /pulp/content/
       interval: 10s
       timeout: 5s
       retries: 5