Update action (#16)

* Update docker compose and github action * Use-reusable docker-compose --------- Co-authored-by: Justin Sherrill <[email protected]>
content-services · Dec 17, 2024 · 169c0b1 · 169c0b1
1 parent 73fd0d2
commit 169c0b1
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 32 deletions.
diff --git a/.github/workflows/tang-actions.yaml b/.github/workflows/tang-actions.yaml
@@ -4,10 +4,10 @@ on:
     branches:
       - main
     paths-ignore:
-      - '**.md'
+      - "**.md"
   pull_request:
     paths-ignore:
-      - '**.md'
+      - "**.md"
 jobs:
   golangci:
     name: Lint
@@ -44,11 +44,15 @@ jobs:
         with:
           go-version: "1.22"
       - name: start pulp
-        uses: isbang/[email protected].1
+        uses: isbang/[email protected].2
         with:
           compose-file: docker-compose.yml
           cwd: ./compose_files/pulp/
           down-flags: --volumes
+        env:
+          PULP_DATABASE_PORT: 5434
+          PULP_API_PORT: 8087
+          PULP_CONTENT_PORT: 8088
       - name: Wait for pulp
         run: |
           docker run --network=host --rm -v ${PWD}:/local curlimages/curl  \

diff --git a/compose_files/pulp/docker-compose.yml b/compose_files/pulp/docker-compose.yml
@@ -1,15 +1,14 @@
-version: '3'
 services:
   postgres:
-    image: "docker.io/library/postgres:13"
+    image: "docker.io/library/postgres:16"
     ports:
-      - "5434:5432"
+      - "${PULP_DATABASE_PORT:-5432}:5432"
     environment:
       POSTGRES_USER: pulp
       POSTGRES_PASSWORD: password
       POSTGRES_DB: pulp
-      POSTGRES_INITDB_ARGS: '--auth-host=scram-sha-256'
-      POSTGRES_HOST_AUTH_METHOD: 'scram-sha-256'
+      POSTGRES_INITDB_ARGS: "--auth-host=scram-sha-256"
+      POSTGRES_HOST_AUTH_METHOD: "scram-sha-256"
     volumes:
       - "pg_data:/var/lib/postgresql"
       - "./assets/postgres/passwd:/etc/passwd:Z"
@@ -22,6 +21,7 @@ services:
 
   migration_service:
     image: "quay.io/redhat-services-prod/pulp-services-tenant/pulp:latest"
+    platform: linux/amd64
     depends_on:
       postgres:
         condition: service_healthy
@@ -30,10 +30,11 @@ services:
     volumes:
       - "./assets/settings.py:/etc/pulp/settings.py:z"
       - "./assets/certs:/etc/pulp/certs:z"
-      - "pulp:/var/lib/pulp"      
+      - "pulp:/var/lib/pulp"
 
   set_init_password_service:
-    image:  "quay.io/redhat-services-prod/pulp-services-tenant/pulp:latest"
+    image: "quay.io/redhat-services-prod/pulp-services-tenant/pulp:latest"
+    platform: linux/amd64
     command: set_init_password.sh
     depends_on:
       migration_service:
@@ -51,16 +52,19 @@ services:
       - "redis_data:/data"
     restart: always
     healthcheck:
-      test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
+      test: ["CMD", "redis-cli", "--raw", "incr", "ping"]
 
   pulp_api:
     image: "quay.io/redhat-services-prod/pulp-services-tenant/pulp:latest"
+    platform: linux/amd64
     deploy:
       replicas: 1
-    command: [ 'pulp-api' ]
+    command: ["pulp-api"]
     depends_on:
       migration_service:
         condition: service_completed_successfully
+    ports:
+      - ${PULP_API_PORT:-8080}:24817
     hostname: pulp-api
     user: pulp
     volumes:
@@ -73,16 +77,21 @@ services:
       PULP_ADMIN_PASSWORD: password
       PULP_DOMAIN_ENABLED: "true"
       PULP_API_ROOT: /api/pulp/
+      PULP_CONTENT_ORIGIN: "http://pulp.content:8081/"
+      PULP_CONTENT_PATH_PREFIX: "/pulp/content/"
     restart: always
 
   pulp_content:
     image: "quay.io/redhat-services-prod/pulp-services-tenant/pulp:latest"
+    platform: linux/amd64
     deploy:
       replicas: 1
-    command: [ 'pulp-content' ]
+    command: ["pulp-content"]
     depends_on:
       migration_service:
         condition: service_completed_successfully
+    ports:
+      - ${PULP_CONTENT_PORT:-8081}:24816
     hostname: pulp-content
     user: pulp
     volumes:
@@ -94,28 +103,16 @@ services:
       POSTGRES_SERVICE_HOST: postgres
       PULP_DOMAIN_ENABLED: "true"
       PULP_API_ROOT: /api/pulp/
-    restart: always
-
-  pulp_web:
-    image: "pulp/pulp-web:latest"
-    command: [ '/usr/bin/nginx.sh' ]
-    depends_on:
-      migration_service:
-        condition: service_completed_successfully
-    ports:
-      - "8087:8080"
-    hostname: pulp
-    user: root
-    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"
+      PULP_CONTENT_ORIGIN: "http://pulp.content:8081/"
+      PULP_CONTENT_PATH_PREFIX: "/pulp/content/"
     restart: always
 
   pulp_worker:
     image: "quay.io/redhat-services-prod/pulp-services-tenant/pulp:latest"
+    platform: linux/amd64
     deploy:
-      replicas: 1
-    command: [ 'pulp-worker' ]
+      replicas: 2
+    command: ["pulp-worker"]
     depends_on:
       migration_service:
         condition: service_completed_successfully
@@ -130,6 +127,9 @@ services:
       POSTGRES_SERVICE_PORT: 5432
       POSTGRES_SERVICE_HOST: postgres
       PULP_DOMAIN_ENABLED: "true"
+      PULP_API_ROOT: /api/pulp/
+      PULP_CONTENT_ORIGIN: "http://pulp.content:8081/"
+      PULP_CONTENT_PATH_PREFIX: "/pulp/content/"
     restart: always
 volumes:
   pulp:

diff --git a/mk/compose.mk b/mk/compose.mk
@@ -6,12 +6,12 @@
 
 .PHONY: compose-up
 compose-up: ## Start up service dependencies using podman(docker)-compose
-	$(PULP_COMPOSE_COMMAND)
+	PULP_DATABASE_PORT=5434 PULP_API_PORT=8087 PULP_CONTENT_PORT=8088 $(PULP_COMPOSE_COMMAND)
 
 .PHONY: compose-down
 compose-down: ## Shut down service  dependencies using podman(docker)-compose
 	$(PULP_COMPOSE_DOWN_COMMAND)
 
 .PHONY: compose-clean ## Clear out data (dbs, files) for service dependencies
 compose-clean: compose-down
-	$(DOCKER) volume prune --force
+	$(DOCKER) volume prune --force