From 1808791e10cc708c00aac1397e308dbf32e72b2f Mon Sep 17 00:00:00 2001 From: Harish Navnit Date: Fri, 17 Jan 2025 20:30:16 +0800 Subject: [PATCH 1/2] fix docker-compose command to support osx --- client/oci_env/utils.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/oci_env/utils.py b/client/oci_env/utils.py index 6a85f36..3d4ce33 100644 --- a/client/oci_env/utils.py +++ b/client/oci_env/utils.py @@ -2,6 +2,7 @@ import pathlib import subprocess import time +import sys from urllib import request @@ -345,6 +346,8 @@ def compose_command(self, cmd, interactive=False, pipe_output=False): takes in the rest of the arguments (exec, up, down, etc) from the user. """ binary = [self.config["COMPOSE_BINARY"] + "-compose", "-p", self.config["COMPOSE_PROJECT_NAME"]] + if sys.platform.lower() == "darwin" and self.config["COMPOSE_BINARY"] == "docker": + binary = [self.config["COMPOSE_BINARY"], "compose", "-p", self.config["COMPOSE_PROJECT_NAME"]] compose_files = [] From 8ccc872edcb573e2b2deba9181d4d5e1a03e8fbb Mon Sep 17 00:00:00 2001 From: Harish Navnit Date: Sun, 19 Jan 2025 14:38:12 +0800 Subject: [PATCH 2/2] fix pulp container name in generate_client.sh --- base/local_scripts/generate_client.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/local_scripts/generate_client.sh b/base/local_scripts/generate_client.sh index 1af5f52..d90cea9 100755 --- a/base/local_scripts/generate_client.sh +++ b/base/local_scripts/generate_client.sh @@ -18,7 +18,7 @@ cd ${SRC_DIR}/pulp-openapi-generator/ export PULP_URL=${API_PROTOCOL}://${API_HOST}:${API_PORT} -CONTAINER_LABEL=$(${COMPOSE_BINARY} container inspect ${COMPOSE_PROJECT_NAME}_pulp_1 | jq -r ".[0].ProcessLabel") +CONTAINER_LABEL=$(${COMPOSE_BINARY} container inspect ${COMPOSE_PROJECT_NAME}-pulp-1 | jq -r ".[0].ProcessLabel") export PULP_MCS_LABEL=${CONTAINER_LABEL#'system_u:system_r:container_t:'} ./generate.sh $PROJECT $LANGUAGE