From 7cce63b66075d30da6d8e32f27fac958ab3aa16f Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 6 Dec 2021 14:59:18 +0100 Subject: [PATCH] fix: make pipenv install system-wide --- Makefile | 9 ++++++++- docker/Dockerfile | 3 +-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 412866f..ea3d079 100755 --- a/Makefile +++ b/Makefile @@ -1,5 +1,8 @@ #!/usr/bin/make -f +## System-wide installation of python/node ? +SYSTEM_INSTALL=0 + ## Configure this part if you wish to DEPLOY_REPO= DEPLOY_OPTS= @@ -69,7 +72,11 @@ prepare-slides: ## install prerequisites for PDF slides only npx browserslist@latest --update-db prepare-docs: ## install prerequisites for static docs site only - pipenv install + if [ "$(SYSTEM_INSTALL)" -eq 1 ]; then \ + pipenv install --system ; \ + else \ + pipenv install ; \ + fi .PHONY: prepare prepare-slides prepare-docs diff --git a/docker/Dockerfile b/docker/Dockerfile index 105d809..0b3106f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,8 +20,7 @@ WORKDIR /app ENV LANG=C ENV LC_ALL=C -RUN make prepare - +RUN make prepare SYSTEM_INSTALL=1 ENTRYPOINT ["/app/docker/entrypoint.sh"] CMD ["watch"]