From 4fea814c3c37a69a14f962ce06068e5716c1938f Mon Sep 17 00:00:00 2001 From: myan Date: Mon, 27 May 2024 02:21:03 +0000 Subject: [PATCH 1/3] deploy maestro with docker Signed-off-by: myan --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5518043c..1dedc5ce 100755 --- a/README.md +++ b/README.md @@ -321,7 +321,13 @@ Login Succeeded! Deploy maestro: -We will push the image to your OpenShift cluster default registry and then deploy it to the cluster. You need to follow [this document](https://docs.openshift.com/container-platform/4.13/registry/securing-exposing-registry.html) to expose a default registry manually and login into the registry with podman. +Before deploying maestro to the Openshift cluster, we will first build image. By default, the container tool is `podman`, but you can override it to use `docker` when necessary. +```shell +$ export container_tool=docker +``` + +Then we will push the image to your OpenShift cluster default registry and then deploy it to the cluster. You need to follow [this document](https://docs.openshift.com/container-platform/4.13/registry/securing-exposing-registry.html) to expose a default registry manually and login into the registry with podman. You can also specific the image information with the environment variables `external_image_registry`, `image_repository` and `image_tag` + ```shell $ make deploy From 60fc16f770e8ecb6008c50a4cbc50b98e8add813 Mon Sep 17 00:00:00 2001 From: myan Date: Mon, 27 May 2024 03:03:59 +0000 Subject: [PATCH 2/3] add image registry doc Signed-off-by: myan --- Makefile | 4 ++-- README.md | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 424361e6..d1cc21d4 100755 --- a/Makefile +++ b/Makefile @@ -22,8 +22,8 @@ environment:=${USER} namespace ?= maestro-${USER} agent_namespace ?= maestro-agent-${USER} -# a tool for managing containers and images, etc. You can set it as docker -container_tool ?= podman +# a tool for managing containers and images, etc. Podman or Docker +container_tool ?= $(shell command -v podman >/dev/null 2>&1 && echo podman || (command -v docker >/dev/null 2>&1 && echo docker)) # In the development environment we are pushing the image directly to the image # registry inside the development cluster. That registry has a different name diff --git a/README.md b/README.md index 1dedc5ce..a6a47ace 100755 --- a/README.md +++ b/README.md @@ -321,13 +321,9 @@ Login Succeeded! Deploy maestro: -Before deploying maestro to the Openshift cluster, we will first build image. By default, the container tool is `podman`, but you can override it to use `docker` when necessary. -```shell -$ export container_tool=docker -``` - -Then we will push the image to your OpenShift cluster default registry and then deploy it to the cluster. You need to follow [this document](https://docs.openshift.com/container-platform/4.13/registry/securing-exposing-registry.html) to expose a default registry manually and login into the registry with podman. You can also specific the image information with the environment variables `external_image_registry`, `image_repository` and `image_tag` +We will push the image to your OpenShift cluster default registry and then deploy it to the cluster. You need to follow [this document](https://docs.openshift.com/container-platform/4.13/registry/securing-exposing-registry.html) to expose a default registry manually and login into the registry with podman. You can also customize the image with the environment variables `external_image_registry`, `image_repository` and `image_tag`. +> Note: The meastro image pulled during deploying comes from the `internal_image_registry`, be sure to specify the correct value for the registry. ```shell $ make deploy From e1bf2e8873954f8011fe8c3848f795e0aa25ad1f Mon Sep 17 00:00:00 2001 From: myan Date: Tue, 28 May 2024 06:46:44 +0000 Subject: [PATCH 3/3] rollback the image registry setting Signed-off-by: myan --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index a6a47ace..5518043c 100755 --- a/README.md +++ b/README.md @@ -321,9 +321,7 @@ Login Succeeded! Deploy maestro: -We will push the image to your OpenShift cluster default registry and then deploy it to the cluster. You need to follow [this document](https://docs.openshift.com/container-platform/4.13/registry/securing-exposing-registry.html) to expose a default registry manually and login into the registry with podman. You can also customize the image with the environment variables `external_image_registry`, `image_repository` and `image_tag`. - -> Note: The meastro image pulled during deploying comes from the `internal_image_registry`, be sure to specify the correct value for the registry. +We will push the image to your OpenShift cluster default registry and then deploy it to the cluster. You need to follow [this document](https://docs.openshift.com/container-platform/4.13/registry/securing-exposing-registry.html) to expose a default registry manually and login into the registry with podman. ```shell $ make deploy