From 2c873093bec105795768287e0ca9280f4e83d06d Mon Sep 17 00:00:00 2001
From: Werner Van Geit <werner.vangeit@epfl.ch>
Date: Wed, 8 May 2024 15:34:49 +0200
Subject: [PATCH] Rename to osparc-meta-dakota

---
 .bumpversion.cfg                              |  2 +-
 .../docker-compose.overwrite.yml              |  2 +-
 .../metadata.yml                              |  2 +-
 .../runtime.yml                               |  6 ++---
 Makefile                                      | 24 +++++++++++++++----
 docker-compose-local.yml                      |  4 ++--
 6 files changed, 28 insertions(+), 12 deletions(-)
 rename .osparc/{osparc-dakota => osparc-meta-dakota}/docker-compose.overwrite.yml (69%)
 rename .osparc/{osparc-dakota => osparc-meta-dakota}/metadata.yml (94%)
 rename .osparc/{osparc-dakota => osparc-meta-dakota}/runtime.yml (86%)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index aff7964..90a25a2 100755
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -4,7 +4,7 @@ commit = False
 message = service version: {current_version} → {new_version}
 tag = False
 
-[bumpversion:file:.osparc/osparc-dakota/metadata.yml]
+[bumpversion:file:.osparc/osparc-meta-dakota/metadata.yml]
 search = {current_version}
 replace = {new_version}
 
diff --git a/.osparc/osparc-dakota/docker-compose.overwrite.yml b/.osparc/osparc-meta-dakota/docker-compose.overwrite.yml
similarity index 69%
rename from .osparc/osparc-dakota/docker-compose.overwrite.yml
rename to .osparc/osparc-meta-dakota/docker-compose.overwrite.yml
index 9bb3c60..1051676 100755
--- a/.osparc/osparc-dakota/docker-compose.overwrite.yml
+++ b/.osparc/osparc-meta-dakota/docker-compose.overwrite.yml
@@ -1,4 +1,4 @@
 services:
-  osparc-dakota:
+  osparc-meta-dakota:
     build:
       dockerfile: Dockerfile
diff --git a/.osparc/osparc-dakota/metadata.yml b/.osparc/osparc-meta-dakota/metadata.yml
similarity index 94%
rename from .osparc/osparc-dakota/metadata.yml
rename to .osparc/osparc-meta-dakota/metadata.yml
index dcaa3bb..8a43929 100755
--- a/.osparc/osparc-dakota/metadata.yml
+++ b/.osparc/osparc-meta-dakota/metadata.yml
@@ -1,6 +1,6 @@
 name: DakotaService
 description: "DakotaServiceService"
-key: simcore/services/dynamic/osparc-dakota
+key: simcore/services/dynamic/osparc-meta-dakota
 version: 0.0.2
 integration-version: 0.0.2
 type: dynamic
diff --git a/.osparc/osparc-dakota/runtime.yml b/.osparc/osparc-meta-dakota/runtime.yml
similarity index 86%
rename from .osparc/osparc-dakota/runtime.yml
rename to .osparc/osparc-meta-dakota/runtime.yml
index fe9c626..3cc1767 100755
--- a/.osparc/osparc-dakota/runtime.yml
+++ b/.osparc/osparc-meta-dakota/runtime.yml
@@ -22,9 +22,9 @@ paths-mapping:
 compose-spec:
   version: "3.7"
   services:
-    osparc-dakota:
-      image: $${SIMCORE_REGISTRY}/simcore/services/dynamic/osparc-dakota:$${SERVICE_VERSION}
+    osparc-meta-dakota:
+      image: $${SIMCORE_REGISTRY}/simcore/services/dynamic/osparc-meta-dakota:$${SERVICE_VERSION}
       environment:
         - OSPARC_API_KEY=$${OSPARC_VARIABLE_API_KEY}
         - OSPARC_API_SECRET=$${OSPARC_VARIABLE_API_SECRET}
-container-http-entrypoint: osparc-dakota
+container-http-entrypoint: osparc-meta-dakota
diff --git a/Makefile b/Makefile
index 8ddcdbb..1d03288 100755
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,13 @@ SHELL = /bin/sh
 .DEFAULT_GOAL := help
 MAKEFLAGS += -j3
 
-export DOCKER_IMAGE_NAME ?= osparc-dakota
+export DOCKER_IMAGE_NAME ?= osparc-meta-dakota
 export DOCKER_IMAGE_TAG ?= 0.0.2
 
+export MASTER_AWS_REGISTRY ?= registry.osparc-master-zmt.click
+export MASTER_REGISTRY ?= registry.osparc-master.speag.com
+export LOCAL_REGISTRY ?= registry:5000
+
 define _bumpversion
 	# upgrades as $(subst $(1),,$@) version, commits and tags
 	@docker run -it --rm -v $(PWD):/${DOCKER_IMAGE_NAME} \
@@ -56,9 +60,21 @@ run-local: clean-validation run-compose-local run-mock-mapservice run-validation
 
 .PHONY: publish-local
 publish-local: ## push to local throw away registry to test integration
-	docker tag simcore/services/dynamic/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} registry:5000/simcore/services/dynamic/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
-	docker push registry:5000/simcore/services/dynamic/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
-	@curl registry:5000/v2/_catalog | jq
+	docker tag simcore/services/dynamic/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} $(LOCAL_REGISTRY)/simcore/services/dynamic/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
+	docker push $(LOCAL_REGISTRY)/simcore/services/dynamic/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
+	@curl $(LOCAL_REGISTRY)/v2/_catalog | jq
+
+publish-master: ## push to local throw away registry to test integration
+	docker tag simcore/services/dynamic/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} $(MASTER_REGISTRY)/simcore/services/dynamic/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
+	docker push $(MASTER_REGISTRY)/simcore/services/dynamic/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
+	@curl $(MASTER_REGISTRY)/v2/_catalog | jq
+
+.PHONY: publish-master-aws
+publish-master-aws: ## push to local throw away registry to test integration
+	docker tag simcore/services/dynamic/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} $(MASTER_AWS_REGISTRY)/simcore/services/dynamic/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
+	docker push $(MASTER_AWS_REGISTRY)/simcore/services/dynamic/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
+	@curl $(MASTER_AWS_REGISTRY)/v2/_catalog | jq
+
 
 .PHONY: help
 help: ## this colorful help
diff --git a/docker-compose-local.yml b/docker-compose-local.yml
index 4e67f1e..fee0646 100755
--- a/docker-compose-local.yml
+++ b/docker-compose-local.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
-  osparc-dakota:
-    image: simcore/services/dynamic/osparc-dakota:0.0.2
+  osparc-meta-dakota:
+    image: simcore/services/dynamic/osparc-meta-dakota:0.0.2
     ports:
       - "8888:8888"
     environment: