diff --git a/docker-compose/Makefile b/docker-compose/Makefile index 64f51f70a39e443c998c0fb3ffbd3f08de0f9e48..6b989f8a12a6ad02c780082e50e55ef1e279b864 100644 --- a/docker-compose/Makefile +++ b/docker-compose/Makefile @@ -106,7 +106,7 @@ else 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. # ifeq ($(NETWORK_MODE),host) @@ -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) 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 $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) down @@ -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 9000-$(NETWORK_MODE) &> /dev/null || ([ $$? -ne 0 ] && docker network create 9000-$(NETWORK_MODE) -o com.docker.network.driver.mtu=9000) 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 $(MAKE) start elk-configure-host # configure host kernel for elk container @@ -197,7 +197,7 @@ restart: ## restart a service (usage: make restart <servicename>) make start $(SERVICE) 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 $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) ps