Skip to content

Commit

Permalink
Limit podman-compose to 1.0.3
Browse files Browse the repository at this point in the history
Similar to how Ubuntu 22.04 has podman 3.4.4
from Dec 2021 also.

Requires using CMD-SHELL healthcheck implicitly to avoid a parsing error.

Fixes "error generating dependency graph for container"

[noissue]
  • Loading branch information
mikedep333 committed Nov 16, 2023
1 parent 603ceed commit dbebd12
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/pulp_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions images/compose/compose.folders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions images/compose/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit dbebd12

Please sign in to comment.