Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui - Dockerfile fixes and missing get_config function

Browse Source
This commit is contained in:
bunkerity 2021-05-31 21:06:05 +02:00
parent 2db967ad1d
commit 82e47f147d
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
6 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/Config.py
View File

@ -36,6 +36,13 @@ class Config :
if stderr != "" or proc.returncode != 0 : if stderr != "" or proc.returncode != 0 :
raise Exception("Error from generator (return code = " + str(proc.returncode) + ") : " + stderr) raise Exception("Error from generator (return code = " + str(proc.returncode) + ") : " + stderr)
def get_config(self) :
config = self.__env_to_dict("/etc/nginx/global.env")
for service in self.get_services() :
for k, v in service.items() :
config[service["FIRST_SERVER"] + "_" + k] = v
return config
def get_settings(self) : def get_settings(self) :
return self.__settings return self.__settings

2
ui/Dockerfile-amd64
View File

@ -15,7 +15,7 @@ COPY ui/ /opt/entrypoint
COPY settings.json /opt COPY settings.json /opt
COPY ui/prepare.sh /tmp COPY ui/prepare.sh /tmp
RUN chmod +x /tmp/prepare && \ RUN chmod +x /tmp/prepare.sh && \
/tmp/prepare.sh && \ /tmp/prepare.sh && \
rm -f /tmp/prepare.sh rm -f /tmp/prepare.sh

2
ui/Dockerfile-arm32v7
View File

@ -21,7 +21,7 @@ COPY ui/ /opt/entrypoint
COPY settings.json /opt COPY settings.json /opt
COPY ui/prepare.sh /tmp COPY ui/prepare.sh /tmp
RUN chmod +x /tmp/prepare && \ RUN chmod +x /tmp/prepare.sh && \
/tmp/prepare.sh && \ /tmp/prepare.sh && \
rm -f /tmp/prepare.sh rm -f /tmp/prepare.sh

2
ui/Dockerfile-arm64v8
View File

@ -21,7 +21,7 @@ COPY ui/ /opt/entrypoint
COPY settings.json /opt COPY settings.json /opt
COPY ui/prepare.sh /tmp COPY ui/prepare.sh /tmp
RUN chmod +x /tmp/prepare && \ RUN chmod +x /tmp/prepare.sh && \
/tmp/prepare.sh && \ /tmp/prepare.sh && \
rm -f /tmp/prepare.sh rm -f /tmp/prepare.sh

2
ui/Dockerfile-i386
View File

@ -15,7 +15,7 @@ COPY ui/ /opt/entrypoint
COPY settings.json /opt COPY settings.json /opt
COPY ui/prepare.sh /tmp COPY ui/prepare.sh /tmp
RUN chmod +x /tmp/prepare && \ RUN chmod +x /tmp/prepare.sh && \
/tmp/prepare.sh && \ /tmp/prepare.sh && \
rm -f /tmp/prepare.sh rm -f /tmp/prepare.sh