binwiederhier 2 лет назад
Родитель
Сommit
c0fab933a5
3 измененных файлов с 18 добавлено и 8 удалено
  1. 2 1
      .gitignore
  2. 4 2
      Dockerfile-build
  3. 12 5
      Makefile

+ 2 - 1
.gitignore

@@ -13,4 +13,5 @@ secrets/
 node_modules/
 .DS_Store
 __pycache__
-web/dev-dist/
+web/dev-dist/
+venv/

+ 4 - 2
Dockerfile-build

@@ -11,7 +11,9 @@ RUN apt-get update && apt-get install -y \
     && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list \
     && apt-get update \
     && apt-get install -y \
-       python3-pip nodejs \
+      python3-pip \
+      python3-venv \
+      nodejs \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
@@ -23,7 +25,7 @@ RUN make docs-deps
 ADD ./mkdocs.yml .
 ADD ./docs ./docs
 RUN make docs-build
- 
+
 # web
 ADD ./web/package.json ./web/package-lock.json ./web/
 RUN make web-deps

+ 12 - 5
Makefile

@@ -95,6 +95,7 @@ docker-dev:
 		--build-arg COMMIT=$(COMMIT) \
 		./
 
+
 # Ubuntu-specific
 
 build-deps-ubuntu:
@@ -103,21 +104,27 @@ build-deps-ubuntu:
 		curl \
 		gcc-aarch64-linux-gnu \
 		gcc-arm-linux-gnueabi \
+		python3 \
+		python3-venv \
 		jq
 	which pip3 || sudo apt-get install -y python3-pip
 
+
 # Documentation
 
 docs: docs-deps docs-build
 
-docs-build: .PHONY
-	mkdocs build
+docs-venv: .PHONY
+	python3 -m venv ./venv
+
+docs-build: docs-venv
+	(. venv/bin/activate && mkdocs build)
 
-docs-deps: .PHONY
-	pip3 install -r requirements.txt
+docs-deps: docs-venv
+	(. venv/bin/activate && pip3 install -r requirements.txt)
 
 docs-deps-update: .PHONY
-	pip3 install -r requirements.txt --upgrade
+	(. venv/bin/activate && pip3 install -r requirements.txt --upgrade)
 
 
 # Web app