app deployment
This commit is contained in:
		
							
								
								
									
										12
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								Makefile
									
									
									
									
									
								
							@@ -6,6 +6,9 @@ make-p:
 | 
				
			|||||||
	# Launch all P targets in parallel and exit as soon as one exits.
 | 
						# Launch all P targets in parallel and exit as soon as one exits.
 | 
				
			||||||
	set -m; (for p in $(P); do ($(MAKE) $$p || kill 0)& done; wait)
 | 
						set -m; (for p in $(P); do ($(MAKE) $$p || kill 0)& done; wait)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					build-client:
 | 
				
			||||||
 | 
						$(NPM) build
 | 
				
			||||||
 | 
					
 | 
				
			||||||
clean-install:
 | 
					clean-install:
 | 
				
			||||||
	rm -fr $(NODE_MODULES)
 | 
						rm -fr $(NODE_MODULES)
 | 
				
			||||||
	rm -fr $(VENV)
 | 
						rm -fr $(VENV)
 | 
				
			||||||
@@ -42,6 +45,15 @@ lint-react:
 | 
				
			|||||||
migrate-db:
 | 
					migrate-db:
 | 
				
			||||||
	$(FLASK) db migrate --directory $(MIGRATIONS)
 | 
						$(FLASK) db migrate --directory $(MIGRATIONS)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					run:
 | 
				
			||||||
 | 
						$(MAKE) P="run-server run-client" make-p
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					run-client:
 | 
				
			||||||
 | 
						serve -s fittrackee_client/build -l 3000
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					run-server:
 | 
				
			||||||
 | 
						cd fittrackee_api && $(GUNICORN) -b 127.0.0.1:5000 "fittrackee_api:create_app()"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
serve-python:
 | 
					serve-python:
 | 
				
			||||||
	$(FLASK) run --with-threads -h $(HOST) -p $(API_PORT)
 | 
						$(FLASK) run --with-threads -h $(HOST) -p $(API_PORT)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,6 +20,7 @@ PYTHON = $(VENV)/bin/python
 | 
				
			|||||||
PIPENV = $(shell command -v pipenv 2> /dev/null)
 | 
					PIPENV = $(shell command -v pipenv 2> /dev/null)
 | 
				
			||||||
FLASK = $(VENV)/bin/flask
 | 
					FLASK = $(VENV)/bin/flask
 | 
				
			||||||
PYTEST = $(VENV)/bin/py.test
 | 
					PYTEST = $(VENV)/bin/py.test
 | 
				
			||||||
 | 
					GUNICORN = $(VENV)/bin/gunicorn
 | 
				
			||||||
COV = $(VENV)/bin/python-codacy-coverage
 | 
					COV = $(VENV)/bin/python-codacy-coverage
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Node env
 | 
					# Node env
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -13,6 +13,7 @@ gpxpy = "==1.2.0"
 | 
				
			|||||||
staticmap = "==0.5.3"
 | 
					staticmap = "==0.5.3"
 | 
				
			||||||
pytz = "==2018.4"
 | 
					pytz = "==2018.4"
 | 
				
			||||||
python-forecastio = "==1.4.0"
 | 
					python-forecastio = "==1.4.0"
 | 
				
			||||||
 | 
					gunicorn = "==19.8.1"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[dev-packages]
 | 
					[dev-packages]
 | 
				
			||||||
pytest = "==3.6.1"
 | 
					pytest = "==3.6.1"
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										10
									
								
								fittrackee_api/Pipfile.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										10
									
								
								fittrackee_api/Pipfile.lock
									
									
									
										generated
									
									
									
								
							@@ -1,7 +1,7 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    "_meta": {
 | 
					    "_meta": {
 | 
				
			||||||
        "hash": {
 | 
					        "hash": {
 | 
				
			||||||
            "sha256": "92d0c43fa07e58aa6a8d6fe38cd8792c363ea6211e6820d2cfc8158267cec57e"
 | 
					            "sha256": "e3e55984559d903ea7c15da7610aa364b9323cb1d0f0b6b8f001a07a17a1bdf2"
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        "pipfile-spec": 6,
 | 
					        "pipfile-spec": 6,
 | 
				
			||||||
        "requires": {
 | 
					        "requires": {
 | 
				
			||||||
@@ -153,6 +153,14 @@
 | 
				
			|||||||
            "index": "pypi",
 | 
					            "index": "pypi",
 | 
				
			||||||
            "version": "==1.2.0"
 | 
					            "version": "==1.2.0"
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
 | 
					        "gunicorn": {
 | 
				
			||||||
 | 
					            "hashes": [
 | 
				
			||||||
 | 
					                "sha256:7ef2b828b335ed58e3b64ffa84caceb0a7dd7c5ca12f217241350dec36a1d5dc",
 | 
				
			||||||
 | 
					                "sha256:bc59005979efb6d2dd7d5ba72d99f8a8422862ad17ff3a16e900684630dd2a10"
 | 
				
			||||||
 | 
					            ],
 | 
				
			||||||
 | 
					            "index": "pypi",
 | 
				
			||||||
 | 
					            "version": "==19.8.1"
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
        "idna": {
 | 
					        "idna": {
 | 
				
			||||||
            "hashes": [
 | 
					            "hashes": [
 | 
				
			||||||
                "sha256:156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e",
 | 
					                "sha256:156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e",
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user