Edit dockerfiles
This commit is contained in:
parent
069b45f37b
commit
1f58d0c517
|
@ -41,7 +41,8 @@ COPY VERSION /opt/bunkerweb/VERSION
|
|||
# Install runtime dependencies, pypi packages, move bwcli, create data folders and set permissions
|
||||
RUN apk add --no-cache bash python3 libgcc libstdc++ openssl git && \
|
||||
cp /opt/bunkerweb/helpers/bwcli /usr/local/bin && \
|
||||
for dir in $(echo "cache configs configs/http configs/stream configs/server-http configs/server-stream configs/default-server-http configs/default-server-stream configs/modsec configs/modsec-crs cache/letsencrypt plugins www") ; do mkdir -p "/data/${dir}" && ln -s "/data/${dir}" "/opt/bunkerweb/${dir}" ; done && \
|
||||
for dir in $(echo "cache configs plugins www") ; do mkdir -p "/data/${dir}" && ln -s "/data/${dir}" "/opt/bunkerweb/${dir}" ; done && \
|
||||
for dir in $(echo "configs/http configs/stream configs/server-http configs/server-stream configs/default-server-http configs/default-server-stream configs/modsec configs/modsec-crs cache/letsencrypt") ; do mkdir -p "/data/${dir}" ; done && \
|
||||
chown -R root:nginx /data && \
|
||||
chmod -R 770 /data && \
|
||||
mkdir /opt/bunkerweb/tmp && \
|
||||
|
|
|
@ -17,6 +17,7 @@ COPY autoconf /opt/bunkerweb/autoconf
|
|||
COPY bw/api /opt/bunkerweb/api
|
||||
COPY bw/cli /opt/bunkerweb/cli
|
||||
COPY bw/core /opt/bunkerweb/core
|
||||
COPY bw/helpers /opt/bunkerweb/helpers
|
||||
COPY bw/settings.json /opt/bunkerweb/settings.json
|
||||
COPY db /opt/bunkerweb/db
|
||||
COPY utils /opt/bunkerweb/utils
|
||||
|
@ -29,7 +30,7 @@ RUN apk add --no-cache bash && \
|
|||
chown -R nginx:nginx /opt/bunkerweb && \
|
||||
find /opt/bunkerweb -type f -exec chmod 0740 {} \; && \
|
||||
find /opt/bunkerweb -type d -exec chmod 0750 {} \; && \
|
||||
chmod 750 /opt/bunkerweb/cli/main.py /usr/local/bin/bwcli /opt/bunkerweb/autoconf/main.py /opt/bunkerweb/deps/python/bin/* && \
|
||||
chmod 750 /opt/bunkerweb/cli/main.py /opt/bunkerweb/helpers/*.sh /usr/local/bin/bwcli /opt/bunkerweb/autoconf/main.py /opt/bunkerweb/deps/python/bin/* && \
|
||||
chown root:nginx /usr/local/bin/bwcli
|
||||
|
||||
# Fix CVEs
|
||||
|
|
|
@ -519,6 +519,7 @@ class Database:
|
|||
).delete()
|
||||
|
||||
to_put = []
|
||||
endl = "\n"
|
||||
if custom_configs:
|
||||
for custom_config in custom_configs:
|
||||
config = {
|
||||
|
@ -538,7 +539,7 @@ class Database:
|
|||
.filter_by(id=custom_config["exploded"][0])
|
||||
.first()
|
||||
):
|
||||
message += f"{'\n' if message else ''}Service {custom_config['exploded'][0]} not found, please check your config"
|
||||
message += f"{endl if message else ''}Service {custom_config['exploded'][0]} not found, please check your config"
|
||||
|
||||
config.update(
|
||||
{
|
||||
|
@ -595,7 +596,7 @@ class Database:
|
|||
session.add_all(to_put)
|
||||
session.commit()
|
||||
except BaseException:
|
||||
return f"{f'{message}\n' if message else ''}{format_exc()}"
|
||||
return f"{f'{message}{endl}' if message else ''}{format_exc()}"
|
||||
|
||||
return message
|
||||
|
||||
|
|
|
@ -29,7 +29,8 @@ COPY ui /opt/bunkerweb/ui
|
|||
RUN apk add --no-cache bash file && \
|
||||
addgroup -g 101 ui && \
|
||||
adduser -h /var/cache/nginx -g ui -s /bin/sh -G ui -D -H -u 101 ui && \
|
||||
for dir in $(echo "cache configs configs/http configs/stream configs/server-http configs/server-stream configs/default-server-http configs/default-server-stream configs/modsec configs/modsec-crs plugins") ; do mkdir -p "/data/${dir}" && ln -s "/data/${dir}" "/opt/bunkerweb/${dir}" ; done && \
|
||||
for dir in $(echo "cache configs plugins") ; do mkdir -p "/data/${dir}" && ln -s "/data/${dir}" "/opt/bunkerweb/${dir}" ; done && \
|
||||
for dir in $(echo "configs/http configs/stream configs/server-http configs/server-stream configs/default-server-http configs/default-server-stream configs/modsec configs/modsec-crs") ; do mkdir -p "/data/${dir}" ; done && \
|
||||
mkdir /opt/bunkerweb/tmp && \
|
||||
chown -R root:ui /opt/bunkerweb && \
|
||||
find /opt/bunkerweb -type f -exec chmod 0740 {} \; && \
|
||||
|
|
Loading…
Reference in New Issue