Skip to content

Commit

Permalink
Docker - fix .env files
Browse files Browse the repository at this point in the history
  • Loading branch information
SamR1 committed Jun 18, 2022
1 parent 5afe053 commit cc4287e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
3 changes: 0 additions & 3 deletions Makefile.config
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
ports:
- "5000:5000"
env_file:
- .env.docker
- .env
depends_on:
- fittrackee-db
- redis
Expand Down
1 change: 1 addition & 0 deletions docsrc/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit cc4287e

Please sign in to comment.