Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor build.py to use DOCKERFILE environment variable in run_command function

Browse source
This commit is contained in:
Théophile Diot 2024-07-31 11:04:37 +01:00
parent f22d396bc7
commit bb3e4bd007
No known key found for this signature in database
GPG key ID: FA995104A0BA376A
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ui/Dockerfile
View file

@ -39,7 +39,7 @@ COPY src/VERSION VERSION
# This will build the frontend and add files to the UI folder
WORKDIR /usr/share/bunkerweb/ui/client
RUN python3 build.py
RUN DOCKERFILE=yes python3 build.py
# We can delete the client folder after building the frontend
RUN rm -rf /usr/share/bunkerweb/ui/client

7
src/ui/client/build.py
View file

@ -1,4 +1,5 @@
# I want to run process
from os import getenv
from shutil import copy, move, rmtree
from subprocess import PIPE, Popen
from pathlib import Path
@ -41,7 +42,7 @@ def run_command(command: List[str]) -> int:
"""Utils to run a subprocess command. This is usefull to run npm commands to build vite project"""
print(f"Running command: {command}", flush=True)
try:
process = Popen(command, stdout=PIPE, stderr=PIPE, cwd=current_directory.as_posix(), text=True)
process = Popen(command, stdout=PIPE, stderr=PIPE, cwd=current_directory.as_posix(), shell=not bool(getenv("DOCKERFILE", "")), text=True)
while process.poll() is None:
if process.stdout is not None:
for line in process.stdout:
@ -49,8 +50,8 @@ def run_command(command: List[str]) -> int:
if process.returncode != 0:
print("Error while running command", flush=True)
print(process.stdout, flush=True)
print(process.stderr, flush=True)
print(process.stdout.read(), flush=True)
print(process.stderr.read(), flush=True)
return 1
except BaseException as e:
print(f"Error while running command: {e}", flush=True)