Skip to content

Commit 0a4fc0f

Browse files
GitHKAndrei Neagu
andauthored
🐛Fix dynamic-sidecar integration issues (ITISFoundation#2468)
* fix legacy dynamic-services validation * ensures all interested images are being pulled * fixed openapi.json, was not running properly * renamed and pushing with compoe as well * docker-compose pull & push in parallel * removed unused model * removed uncecessary parameter * codestyle Co-authored-by: Andrei Neagu <[email protected]>
1 parent 2424242 commit 0a4fc0f

File tree

9 files changed

+253
-225
lines changed

9 files changed

+253
-225
lines changed

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ tag-latest: ## Tags last locally built production images as '${DOCKER_REGISTRY}/
300300

301301
pull-version: .env ## pulls images from DOCKER_REGISTRY tagged as DOCKER_IMAGE_TAG
302302
# Pulling images '${DOCKER_REGISTRY}/{service}:${DOCKER_IMAGE_TAG}'
303-
@docker-compose --file services/docker-compose.yml pull
303+
@docker-compose --file services/docker-compose-deploy.yml pull
304304

305305

306306
.PHONY: push-version push-latest
@@ -313,9 +313,7 @@ push-latest: tag-latest
313313
# TODO: change to docker-compose push when make config-version available
314314
push-version: tag-version
315315
# pushing '${DOCKER_REGISTRY}/{service}:${DOCKER_IMAGE_TAG}'
316-
$(foreach service, $(SERVICES_LIST)\
317-
,docker push ${DOCKER_REGISTRY}/$(service):${DOCKER_IMAGE_TAG}; \
318-
)
316+
@docker-compose --file services/docker-compose-build.yml --file services/docker-compose-deploy.yml push
319317

320318

321319
## ENVIRONMENT -------------------------------

services/director-v2/.env-devel

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ POSTGRES_PORT=5432
3434
RABBIT_USER=admin
3535
RABBIT_PASSWORD=adminadmin
3636

37+
REGISTRY_AUTH=True
38+
REGISTRY_PW=adminadmin
39+
REGISTRY_SSL=True
40+
REGISTRY_URL=registry.osparc-master.speag.com
41+
REGISTRY_USER=admin
42+
3743
SIMCORE_SERVICES_NETWORK_NAME=interactive_services_subnet
3844

3945
STORAGE_ENDPOINT=http://storage:8080

0 commit comments

Comments
 (0)