From c5d4f557eb3c9104b1f58023780ab402aa8a390a Mon Sep 17 00:00:00 2001 From: Omar Al-Ithawi Date: Thu, 27 Dec 2018 12:14:12 +0200 Subject: [PATCH 1/3] Add missing `make` command --- tahoe.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tahoe.mk b/tahoe.mk index 3981a5f8d3..ccf16de737 100644 --- a/tahoe.mk +++ b/tahoe.mk @@ -67,7 +67,7 @@ tahoe.up: ## Run the devstack with proper Tahoe settings, use instead of `$ mak make dev.up @sleep 1 make tahoe.init - test -d $(CUSTOMER_THEME_DIR) || (make tahoe.theme.reset && tahoe.theme.compile) + test -d $(CUSTOMER_THEME_DIR) || (make tahoe.theme.reset && make tahoe.theme.compile) test -d $(AMC_DIR) || make amc.reset test -f $(AMC_DIR)/amc/.env || make amc.env-file make tahoe.chown From 06bde1a53f7ab02aa386f97137260d192195fe9a Mon Sep 17 00:00:00 2001 From: Omar Al-Ithawi Date: Tue, 15 Jan 2019 22:44:32 +0300 Subject: [PATCH 2/3] Static names for the regis and postgres containers --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 3a57061834..120564daaa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -211,6 +211,7 @@ services: postgres: image: postgres:9.4 + container_name: tahoe.devstack.postgres volumes: - postgres_data:/var/lib/postgresql/data ports: @@ -218,6 +219,7 @@ services: redis: image: redis:3.0 + container_name: tahoe.devstack.redis ports: - 6379:6379 volumes: From c872a7136ce92ae961c409b79cf3dcc7bcba61d4 Mon Sep 17 00:00:00 2001 From: Omar Al-Ithawi Date: Tue, 15 Jan 2019 22:46:26 +0300 Subject: [PATCH 3/3] Remove needless mysql installation step --- tahoe.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/tahoe.mk b/tahoe.mk index ccf16de737..97fa035275 100644 --- a/tahoe.mk +++ b/tahoe.mk @@ -107,7 +107,6 @@ amc.reset: ## Removes and re-initialize AMC cd $(AMC_DIR)/amc/ && virtualenv -p python3 env cd $(AMC_DIR)/amc/ && . env/bin/activate && pip install --upgrade pip cd $(AMC_DIR)/amc/ && . env/bin/activate && pip install -r ../requirements/local.txt - cd $(AMC_DIR)/amc/ && . env/bin/activate && pip install mysql-python cd $(AMC_DIR)/frontend/ && npm install || true