Commit 87f9c14e authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

Test pipeline execution with new files configuration.

parent f45254ff

csp-lmc-common/docker/.make/Makefile.mk→csp-lmc-common/.make/Makefile.mk

+2 −2
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ DEFAULT_TAG=$(IMAGE):$(BASE_VERSION) 


SHELL=/bin/bash



DOCKER_BUILD_CONTEXT=..

DOCKER_FILE_PATH=Dockerfile

DOCKER_BUILD_CONTEXT=.

DOCKER_FILE_PATH=docker/Dockerfile



.PHONY: pre-build docker-build post-build build release patch-release minor-release major-release tag check-status check-release showver \

	push pre-push do-push post-push

csp-lmc-common/docker/Makefile→csp-lmc-common/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ else 
CONTAINER_NAME_PREFIX := $(PROJECT)-

endif



COMPOSE_FILES := $(wildcard *.yml)

COMPOSE_FILES := $(wildcard docker/*.yml)

COMPOSE_FILE_ARGS := $(foreach yml,$(COMPOSE_FILES),-f $(yml))



ifeq ($(OS),Windows_NT)
@@ -153,7 +153,7 @@ endif 
	#$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) pull

	#to pull only the mid-cbf-mcs image remove comment on row below.

	#docker pull $(DOCKER_REGISTRY_HOST)/$(DOCKER_REGISTRY_USER)/mid-cbf-mcs:latest

	$(DOCKER_COMPOSE_ARGS) docker-compose -f csp-tangodb.yml up -d

	$(DOCKER_COMPOSE_ARGS) docker-compose -f docker/csp-tangodb.yml up -d

	# put a sleep to wait TANGO DB 

	@sleep 10

	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) up -d