diff --git a/Makefile.config b/Makefile.config index 6f31f7b3..c1b0dd0b 100644 --- a/Makefile.config +++ b/Makefile.config @@ -2,15 +2,12 @@ export HOST = 0.0.0.0 export PORT = 5000 export CLIENT_PORT = 3000 -export FLASK_APP = $(PWD)/fittrackee/__main__.py export MIGRATIONS = $(PWD)/fittrackee/migrations export APP_WORKERS = 1 export WORKERS_PROCESSES = 1 # for dev env export FLASK_ENV = development -export APP_SETTINGS = fittrackee.config.DevelopmentConfig -export DATABASE_URL = postgresql://fittrackee:fittrackee@$(HOST):5432/fittrackee export DATABASE_TEST_URL = postgresql://fittrackee:fittrackee@$(HOST):5432/fittrackee_test export TEST_APP_URL = http://$(HOST):$(PORT) export TEST_CLIENT_URL = http://$(HOST):$(CLIENT_PORT) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 41478763..f1b5f3c8 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -19,7 +19,7 @@ services: ports: - "5000:5000" env_file: - - .env.docker + - .env depends_on: - fittrackee-db - redis diff --git a/docsrc/source/installation.rst b/docsrc/source/installation.rst index 8e216f61..304df626 100644 --- a/docsrc/source/installation.rst +++ b/docsrc/source/installation.rst @@ -685,6 +685,7 @@ For evaluation purposes, docker files are available, installing **FitTrackee** f $ git clone https://github.com/SamR1/FitTrackee.git $ cd FitTrackee + $ cp .env.docker .env $ make docker-build docker-run docker-init Open http://localhost:5000 and register.