diff --git a/Makefile b/Makefile index a102480..033b96f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ PYTHON=python3 VENV=.venv VENVPATH=$(VENV)/$(shell uname)-$(shell uname -m)-sdk-python +VIRTUALENV = $(PYTHON) -m venv ENV=prod REGION=.learnosity.com @@ -68,7 +69,7 @@ real-clean: clean # Python environment and dependencies venv: $(VENVPATH) $(VENVPATH): - unset PYTHONPATH; virtualenv -p$(PYTHON) $(VENVPATH) + unset PYTHONPATH; $(VIRTUALENV) $(VENVPATH) $(call venv-activate); \ pip install -e . diff --git a/docker.mk b/docker.mk new file mode 100644 index 0000000..83a394c --- /dev/null +++ b/docker.mk @@ -0,0 +1,12 @@ +PYTHON_VERSION = 3.9 +PWD = $(shell pwd -P) +DKR = docker container run -t --rm \ + -v $(PWD):/srv/sdk/python \ + -v lrn-sdk-python_cache:/root/.cache:z,delegated \ + -w /srv/sdk/python \ + -e PYTHON_VERSION=$(PYTHON_VERSION) \ + -e ENV -e REGION -e VER \ + python:$(PYTHON_VERSION) + +%: + $(DKR) make -e $@