diff --git a/.github/workflows/tang-actions.yaml b/.github/workflows/tang-actions.yaml index 3681fd6..e593e04 100644 --- a/.github/workflows/tang-actions.yaml +++ b/.github/workflows/tang-actions.yaml @@ -49,10 +49,14 @@ jobs: 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 \ - curl --retry-all-errors --fail --retry-delay 10 --retry 32 --retry-max-time 240 http://localhost:8080/api/pulp/default/api/v3/repositories/rpm/rpm/ -u admin:password + curl --retry-all-errors --fail --retry-delay 10 --retry 32 --retry-max-time 240 http://localhost:8087/api/pulp/default/api/v3/repositories/rpm/rpm/ -u admin:password sleep 30 - name: integration tests run: | @@ -63,6 +67,6 @@ jobs: DATABASE_USER: pulp DATABASE_NAME: pulp DATABASE_PASSWORD: password - SERVER_URL: http://localhost:8080 + SERVER_URL: http://localhost:8087 SERVER_USERNAME: admin SERVER_PASSWORD: password diff --git a/compose_files/pulp/docker-compose.yml b/compose_files/pulp/docker-compose.yml index d1fe4de..20a3a81 100644 --- a/compose_files/pulp/docker-compose.yml +++ b/compose_files/pulp/docker-compose.yml @@ -2,7 +2,7 @@ services: postgres: image: "docker.io/library/postgres:16" ports: - - "5434:5432" + - "${PULP_DATABASE_PORT:-5432}:5432" environment: POSTGRES_USER: pulp POSTGRES_PASSWORD: password @@ -64,7 +64,7 @@ services: migration_service: condition: service_completed_successfully ports: - - 8080:24817 + - ${PULP_API_PORT:-8080}:24817 hostname: pulp-api user: pulp volumes: @@ -91,7 +91,7 @@ services: migration_service: condition: service_completed_successfully ports: - - 8081:24816 + - ${PULP_CONTENT_PORT:-8081}:24816 hostname: pulp-content user: pulp volumes: @@ -111,7 +111,7 @@ services: image: "quay.io/redhat-services-prod/pulp-services-tenant/pulp:latest" platform: linux/amd64 deploy: - replicas: 1 + replicas: 2 command: ["pulp-worker"] depends_on: migration_service: diff --git a/mk/compose.mk b/mk/compose.mk index a9e7d94..f355f94 100644 --- a/mk/compose.mk +++ b/mk/compose.mk @@ -6,7 +6,7 @@ .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 @@ -14,4 +14,4 @@ compose-down: ## Shut down service dependencies using podman(docker)-compose .PHONY: compose-clean ## Clear out data (dbs, files) for service dependencies compose-clean: compose-down - $(DOCKER) volume prune --force \ No newline at end of file + $(DOCKER) volume prune --force