Skip to content

LRN-34037 Option 2: Containerise with extra makefile #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
david-scarratt-lrn wants to merge 2 commits into from
Closed

LRN-34037 Option 2: Containerise with extra makefile #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
337325e
[REFACTOR] Python containers don't come with standalone virtualenv
david-scarratt-lrn Nov 5, 2021
426c659
[FEATURE] Add container layer to external makefile
david-scarratt-lrn Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 .

Expand Down
12 changes: 12 additions & 0 deletions docker.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 $@