Skip to content
Snippets Groups Projects
Commit 07119769 authored by Stefano Di Frischia's avatar Stefano Di Frischia
Browse files

Merge branch 'master' into L2SS-781-add-observation-device-to-archiver

parents 533388f8 5250e005
No related branches found
No related tags found
1 merge request!328Resolve L2SS-781-add-observation-device-to-archiver
Show whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 deletions
docker-compose/Makefile
+ 4
− 4
View file @ 07119769
...@@ -106,7 +106,7 @@ else ...@@ -106,7 +106,7 @@ else
endif endif
# #
# When running in network=host mode, point devices at a port on the host # When uunning in network=host mode, point devices at a port on the host
# machine rather than at the container. # machine rather than at the container.
# #
ifeq ($(NETWORK_MODE),host) ifeq ($(NETWORK_MODE),host)
...@@ -160,7 +160,7 @@ up: minimal ## start the base TANGO system and prepare requested services ...@@ -160,7 +160,7 @@ up: minimal ## start the base TANGO system and prepare requested services
$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) up --no-start --no-recreate $(SERVICE) $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) up --no-start --no-recreate $(SERVICE)
run: minimal ## run a service using arguments and delete it afterwards run: minimal ## run a service using arguments and delete it afterwards
$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) run --rm $(SERVICE) $(SERVICE_ARGS) $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) run --no-deps --rm $(SERVICE) $(SERVICE_ARGS)
down: ## stop all services and tear down the system down: ## stop all services and tear down the system
$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) down $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) down
...@@ -174,7 +174,7 @@ ifneq ($(NETWORK_MODE),host) ...@@ -174,7 +174,7 @@ ifneq ($(NETWORK_MODE),host)
docker network inspect $(NETWORK_MODE) &> /dev/null || ([ $$? -ne 0 ] && docker network create $(NETWORK_MODE)) docker network inspect $(NETWORK_MODE) &> /dev/null || ([ $$? -ne 0 ] && docker network create $(NETWORK_MODE))
docker network inspect 9000-$(NETWORK_MODE) &> /dev/null || ([ $$? -ne 0 ] && docker network create 9000-$(NETWORK_MODE) -o com.docker.network.driver.mtu=9000) docker network inspect 9000-$(NETWORK_MODE) &> /dev/null || ([ $$? -ne 0 ] && docker network create 9000-$(NETWORK_MODE) -o com.docker.network.driver.mtu=9000)
endif endif
$(DOCKER_COMPOSE_ARGS) docker-compose -f tango.yml -f networks.yml up -d $(DOCKER_COMPOSE_ARGS) docker-compose -f tango.yml -f networks.yml up --no-recreate -d
bootstrap: pull build # first start, initialise from scratch bootstrap: pull build # first start, initialise from scratch
$(MAKE) start elk-configure-host # configure host kernel for elk container $(MAKE) start elk-configure-host # configure host kernel for elk container
...@@ -197,7 +197,7 @@ restart: ## restart a service (usage: make restart <servicename>) ...@@ -197,7 +197,7 @@ restart: ## restart a service (usage: make restart <servicename>)
make start $(SERVICE) make start $(SERVICE)
attach: ## attach a service to an existing Tango network attach: ## attach a service to an existing Tango network
$(DOCKER_COMPOSE_ARGS) docker-compose $(ATTACH_COMPOSE_FILE_ARGS) up -d $(SERVICE) $(DOCKER_COMPOSE_ARGS) docker-compose $(ATTACH_COMPOSE_FILE_ARGS) up --no-recreate -d $(SERVICE)
status: ## show the container status status: ## show the container status
$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) ps $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) ps
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment