Update compose files

[noissue]
pulp · Aug 29, 2023 · d5a35c7 · d5a35c7
1 parent 60d3e79
commit d5a35c7
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 18 deletions.
diff --git a/.github/workflows/pulp_images.yml b/.github/workflows/pulp_images.yml
@@ -201,16 +201,10 @@ jobs:
         run: |
           echo ::group::HTTPIE
           sudo apt-get update -yq
-          sudo -E apt-get -yq --no-install-suggests --no-install-recommends install httpie
+          sudo -E apt-get -yq --no-install-suggests --no-install-recommends install httpie podman containernetworking-plugins
           echo ::endgroup::
           echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV
           pip install podman-compose
-          if [[ $(dpkg-query --showformat='${Version}' --show podman) == "3.4.4+ds1-1ubuntu1.22.04.1" && $(dpkg-query --showformat='${Version}' --show containernetworking-plugins) == "0.9.1+ds1-1" ]]
-          then
-            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-1_amd64.deb
-            sudo dpkg -i containernetworking-plugins_1.1.1+ds1-1_amd64.deb
-          fi
         shell: bash
 
       - name: Build images

diff --git a/images/compose/assets/settings.py b/images/compose/assets/settings.py
@@ -14,5 +14,5 @@
 TOKEN_SIGNATURE_ALGORITHM = "ES256"
 PUBLIC_KEY_PATH = "/etc/pulp/keys/container_auth_public_key.pem"
 PRIVATE_KEY_PATH = "/etc/pulp/keys/container_auth_private_key.pem"
-TELEMETRY = False
+ANALYTICS = False
 STATIC_ROOT = "/var/lib/operator/static/"
diff --git a/images/compose/compose.folders.yml b/images/compose/compose.folders.yml
@@ -1,9 +1,7 @@
-version: '3'
+version: '3.7'
 services:
   postgres:
     image: "docker.io/library/postgres:13"
-    ports:
-      - "5432:5432"
     environment:
       POSTGRES_USER: pulp
       POSTGRES_PASSWORD: password
@@ -13,18 +11,27 @@ services:
     volumes:
       - "../../pgsql:/var/lib/postgresql:Z"
       - "./assets/postgres/passwd:/etc/passwd:Z"
+    networks:
+      - pulp_internal
+    restart: always
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U pulp" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
   redis:
     image: "docker.io/library/redis:latest"
     volumes:
       - "redis_data:/data"
+    networks:
+      - pulp_internal
+    restart: always
 
   pulp_web:
     image: "pulp/pulp-web:latest"
     command: ['/usr/bin/nginx.sh']
     depends_on:
-      postgres:
-        condition: service_healthy
       pulp_api:
       pulp_content:
     ports:
@@ -34,6 +41,9 @@ services:
     volumes:
       - "./assets/bin/nginx.sh:/usr/bin/nginx.sh:Z"
       - "./assets/nginx/nginx.conf.template:/etc/opt/rh/rh-nginx116/nginx/nginx.conf.template:Z"
+    networks:
+      - pulp_internal
+    restart: always
 
   pulp_api:
     image: "pulp/pulp-minimal:latest"
@@ -50,10 +60,13 @@ services:
       - "./assets/settings.py:/etc/pulp/settings.py:z"
       - "./assets/certs:/etc/pulp/certs:z"
       - "../../pulp_storage:/var/lib/pulp:z"
+    networks:
+      - pulp_internal
     environment:
       POSTGRES_SERVICE_PORT: 5432
       POSTGRES_SERVICE_HOST: postgres
       PULP_ADMIN_PASSWORD: password
+    restart: always
 
   pulp_content:
     image: "pulp/pulp-minimal:latest"
@@ -70,9 +83,12 @@ services:
       - "./assets/settings.py:/etc/pulp/settings.py:z"
       - "./assets/certs:/etc/pulp/certs:z"
       - "../../pulp_storage:/var/lib/pulp:z"
+    networks:
+      - pulp_internal
     environment:
       POSTGRES_SERVICE_PORT: 5432
       POSTGRES_SERVICE_HOST: postgres
+    restart: always
 
   pulp_worker:
     image: "pulp/pulp-minimal:latest"
@@ -88,9 +104,15 @@ services:
       - "./assets/settings.py:/etc/pulp/settings.py:z"
       - "./assets/certs:/etc/pulp/certs:z"
       - "../../pulp_storage:/var/lib/pulp:z"
+    networks:
+      - pulp_internal
     environment:
       POSTGRES_SERVICE_PORT: 5432
       POSTGRES_SERVICE_HOST: postgres
+    restart: always
+
+networks:
+  pulp_internal:
 
 volumes:
   redis_data:

diff --git a/images/compose/compose.yml b/images/compose/compose.yml
@@ -1,9 +1,7 @@
-version: '3'
+version: '3.7'
 services:
   postgres:
     image: "docker.io/library/postgres:13"
-    ports:
-      - "5432:5432"
     environment:
       POSTGRES_USER: pulp
       POSTGRES_PASSWORD: password
@@ -13,6 +11,8 @@ services:
     volumes:
       - "pg_data:/var/lib/postgresql"
       - "./assets/postgres/passwd:/etc/passwd:Z"
+    networks:
+      - pulp_internal
     restart: always
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready -U pulp" ]
@@ -24,14 +24,14 @@ services:
     image: "docker.io/library/redis:latest"
     volumes:
       - "redis_data:/data"
+    networks:
+      - pulp_internal
     restart: always
 
   pulp_web:
     image: "pulp/pulp-web:latest"
     command: ['/usr/bin/nginx.sh']
     depends_on:
-      postgres:
-        condition: service_healthy
       pulp_api:
       pulp_content:
     ports:
@@ -41,6 +41,8 @@ services:
     volumes:
       - "./assets/bin/nginx.sh:/usr/bin/nginx.sh:Z"
       - "./assets/nginx/nginx.conf.template:/etc/opt/rh/rh-nginx116/nginx/nginx.conf.template:Z"
+    networks:
+      - pulp_internal
     restart: always
 
   pulp_api:
@@ -58,6 +60,8 @@ services:
       - "./assets/settings.py:/etc/pulp/settings.py:z"
       - "./assets/certs:/etc/pulp/certs:z"
       - "pulp:/var/lib/pulp"
+    networks:
+      - pulp_internal
     environment:
       POSTGRES_SERVICE_PORT: 5432
       POSTGRES_SERVICE_HOST: postgres
@@ -79,6 +83,8 @@ services:
       - "./assets/settings.py:/etc/pulp/settings.py:z"
       - "./assets/certs:/etc/pulp/certs:z"
       - "pulp:/var/lib/pulp"
+    networks:
+      - pulp_internal
     environment:
       POSTGRES_SERVICE_PORT: 5432
       POSTGRES_SERVICE_HOST: postgres
@@ -98,11 +104,16 @@ services:
       - "./assets/settings.py:/etc/pulp/settings.py:z"
       - "./assets/certs:/etc/pulp/certs:z"
       - "pulp:/var/lib/pulp"
+    networks:
+      - pulp_internal
     environment:
       POSTGRES_SERVICE_PORT: 5432
       POSTGRES_SERVICE_HOST: postgres
     restart: always
 
+networks:
+  pulp_internal:
+
 volumes:
   pulp:
     name: pulp${DEV_VOLUME_SUFFIX:-dev}