Skip to content

Fixes for the devstack #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 28, 2019
Merged

Fixes for the devstack #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5d4f55
Add missing `make` command
OmarIthawi Dec 27, 2018
06bde1a
Static names for the regis and postgres containers
OmarIthawi Jan 15, 2019
c872a71
Remove needless mysql installation step
OmarIthawi Jan 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,13 +211,15 @@ services:

postgres:
image: postgres:9.4
container_name: tahoe.devstack.postgres
volumes:
- postgres_data:/var/lib/postgresql/data
ports:
- 5432:5432

redis:
image: redis:3.0
container_name: tahoe.devstack.redis
ports:
- 6379:6379
volumes:
Expand Down
3 changes: 1 addition & 2 deletions tahoe.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down