Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'docker-fix' into dev

Browse Source
This commit is contained in:
Sam 2022-06-18 17:22:13 +02:00
commit 3b47353a7b
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.config
View File

@ -2,15 +2,12 @@ export HOST = 0.0.0.0
export PORT = 5000 export PORT = 5000
export CLIENT_PORT = 3000 export CLIENT_PORT = 3000
export FLASK_APP = $(PWD)/fittrackee/__main__.py
export MIGRATIONS = $(PWD)/fittrackee/migrations export MIGRATIONS = $(PWD)/fittrackee/migrations
export APP_WORKERS = 1 export APP_WORKERS = 1
export WORKERS_PROCESSES = 1 export WORKERS_PROCESSES = 1
# for dev env # for dev env
export FLASK_ENV = development 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 DATABASE_TEST_URL = postgresql://fittrackee:fittrackee@$(HOST):5432/fittrackee_test
export TEST_APP_URL = http://$(HOST):$(PORT) export TEST_APP_URL = http://$(HOST):$(PORT)
export TEST_CLIENT_URL = http://$(HOST):$(CLIENT_PORT) export TEST_CLIENT_URL = http://$(HOST):$(CLIENT_PORT)

2
docker-compose-dev.yml
View File

@ -19,7 +19,7 @@ services:
ports: ports:
- "5000:5000" - "5000:5000"
env_file: env_file:
- .env.docker - .env
depends_on: depends_on:
- fittrackee-db - fittrackee-db
- redis - redis

1
docs/_sources/installation.rst.txt
View File

@ -685,6 +685,7 @@ For evaluation purposes, docker files are available, installing **FitTrackee** f
$ git clone https://github.com/SamR1/FitTrackee.git $ git clone https://github.com/SamR1/FitTrackee.git
$ cd FitTrackee $ cd FitTrackee
$ cp .env.docker .env
$ make docker-build docker-run docker-init $ make docker-build docker-run docker-init
Open http://localhost:5000 and register. Open http://localhost:5000 and register.

1
docs/installation.html
View File

@ -960,6 +960,7 @@ server {
</ul> </ul>
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>$ git clone https://github.com/SamR1/FitTrackee.git <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>$ git clone https://github.com/SamR1/FitTrackee.git
$ <span class="nb">cd</span> FitTrackee $ <span class="nb">cd</span> FitTrackee
$ cp .env.docker .env
$ make docker-build docker-run docker-init $ make docker-build docker-run docker-init
</pre></div> </pre></div>
</div> </div>

1
docsrc/source/installation.rst
View File

@ -685,6 +685,7 @@ For evaluation purposes, docker files are available, installing **FitTrackee** f
$ git clone https://github.com/SamR1/FitTrackee.git $ git clone https://github.com/SamR1/FitTrackee.git
$ cd FitTrackee $ cd FitTrackee
$ cp .env.docker .env
$ make docker-build docker-run docker-init $ make docker-build docker-run docker-init
Open http://localhost:5000 and register. Open http://localhost:5000 and register.