diff --git a/Makefile b/Makefile index bf222ff..524175c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Makefile driver for SWH Python modules. DO NOT CHANGE. # You can add custom Makefile rules to Makefile.local -#include ../Makefile.python +include ../Makefile.python -include Makefile.local diff --git a/Makefile.local b/Makefile.local index 7de947e..8cb95ce 100644 --- a/Makefile.local +++ b/Makefile.local @@ -1,51 +1,32 @@ # should be provided by the ci build TAG=latest IMAGE_NAME=softwareheritage/graphql:$(TAG) # ci build should provide the right label IMAGE_LABEL=dummy # can be overridden by ci REGISTRY_URL=registry-1.docker.io -.PHONY: run-dev test +.PHONY: run-dev run-dev: export SWH_CONFIG_FILENAME=config/dev.yml; uvicorn swh.graphql.server:make_app_from_configfile --reload --factory .PHONY: run-dev-stable run-dev-stable: export SWH_CONFIG_FILENAME=config/dev.yml; uvicorn swh.graphql.server:make_app_from_configfile --factory .PHONY: run-wsgi run-wsgi: export SWH_CONFIG_FILENAME=config/staging.yml; gunicorn --workers=2 'swh.graphql.server:make_app_from_configfile()' .PHONY: run-dev-docker run-dev-docker: docker-compose -f docker-compose.yml -f docker-compose-dev.yml up --build .PHONY: run-wsgi-docker run-wsgi-docker: docker-compose -f docker-compose.yml -f docker-compose-staging.yml up --build .PHONY: update-desktop6 update-desktop6: git pull origin master docker-compose -f docker-compose.yml -f docker-compose-staging.yml restart - -build: - docker build \ - --tag $(IMAGE_NAME) \ - -f Dockerfile \ - --label $(IMAGE_LABEL) \ - . - -# This is meant for ci -push: - docker tag $(IMAGE_NAME) $(REGISTRY_URL)/$(IMAGE_NAME) - docker push $(REGISTRY_URL)/$(IMAGE_NAME) - -test: - # noop for now - -clean: - docker image ls -q --filter label=$(IMAGE_LABEL) \ - | uniq | xargs -r -t docker rmi --force