diff --git a/Makefile.local b/Makefile.local index dd82804..cae4c18 100644 --- a/Makefile.local +++ b/Makefile.local @@ -1,3 +1,20 @@ .PHONY: run-dev run-dev: - docker-compose up + uvicorn swh.graphql.asgi:application --reload + +.PHONY: run-dev-stable +run-dev-stable: + uvicorn swh.graphql.asgi:application + +.PHONY: run-dev-docker +run-dev-docker: + docker-compose -f docker-compose.yml -f docker-compose-dev.yml up --build + +.PHONY: run-staging +run-staging: + docker-compose -f docker-compose.yml -f docker-compose-staging.yml up --build + +.PHONY: update-staging +update-staging: + git pull origin master + docker-compose -f docker-compose.yml -f docker-compose-staging.yml restart diff --git a/README b/README deleted file mode 100644 index bb87b89..0000000 --- a/README +++ /dev/null @@ -1,5 +0,0 @@ -# To run In dev mode - -* uvicorn swh.graphql.asgi:application - -* http://127.0.0.1:8000/ diff --git a/README.md b/README.md new file mode 100644 index 0000000..363c9b1 --- /dev/null +++ b/README.md @@ -0,0 +1,21 @@ +# swh-graphql + +## dev mode inside docker + +* make run-dev-docker + +## dev mode without docker + +* make run-dev + +## dev mode without auto reload + +* make run-dev-stable + +## staging mode inside docker + +* make run-staging + +## visit + +* http://localhost:8000/ diff --git a/docker-compose-staging.yml b/docker-compose-staging.yml index fc17347..99fde29 100644 --- a/docker-compose-staging.yml +++ b/docker-compose-staging.yml @@ -1,9 +1,11 @@ version: "3.4" services: app: dns: 192.168.100.29 + environment: + - RUNNING_ENV=staging command: gunicorn --bind=0.0.0.0:8000 --workers=2 swh.graphql.wsgi:application # haproxy: # command: uvicorn swh.graphql.app:app --host 0.0.0.0 --port 8000 diff --git a/docker-compose.yml b/docker-compose.yml index 377bb84..03d1520 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,13 @@ version: "3.4" services: app: build: context: ./ dockerfile: Dockerfile + environment: + - RUNNING_ENV=dev volumes: - ".:/usr/src/app" ports: - "8000:8000"