From 6b6ca4358e872bbd0ccc635e106ccf733ec33af7 Mon Sep 17 00:00:00 2001 From: Jan David Mol <mol@astron.nl> Date: Fri, 13 May 2022 11:56:48 +0200 Subject: [PATCH] L2SS-792: Never recreate containers if they've already been started. If we want to recreate, we will always be explicit --- docker-compose/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose/Makefile b/docker-compose/Makefile index 64f51f70a..4ef9160b9 100644 --- a/docker-compose/Makefile +++ b/docker-compose/Makefile @@ -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 -- GitLab