still trying to improve docker images (#323)

parent 7a23181f
Pipeline #1707 passed with stages
in 12 minutes and 30 seconds
......@@ -3,7 +3,7 @@ FROM alpine:3.10
ARG BURP_VERSION=2.2.18
ARG UTHASH_VERSION=2.1.0
RUN apk add --no-cache supervisor logrotate librsync libressl tzdata bash coreutils \
RUN apk add --no-cache supervisor bash logrotate librsync libressl tzdata bash coreutils \
&& apk add --no-cache --virtual .fetch-deps \
tar \
\
......
......@@ -72,8 +72,10 @@ appStart () {
echo "Setting up burp & burp-ui:"
COMMAND="bui-manage -c $BURPUI_CONFIG setup-burp --burp-conf-cli $BURP_CLIENT_CONFIG --burp-conf-serv $BURP_SERVER_CONFIG --host $BURP_SERVER_ADDR --client $BURPUI_CLIENT_NAME --redis $REDIS_SERVER --database $DATABASE_URL --plugins $BURPUI_PLUGINS --monitor $BURPUI_MONITOR_CONFIG --concurrency $ASYNC_CONCURRENCY --pool-size $ASYNC_POOL_SIZE --backend $BURPUI_BACKEND --listen $BURP_RESTORE_LISTEN_ADDR"
echo $COMMAND
set +e
doas burpui "$COMMAND 2>&1 | tee $LOGFILE"
ret=$?
set -e
# restart burp-server
python /check-burp-server.py
......@@ -89,6 +91,7 @@ appStart () {
echo "8<---------------------------------------------------"
cat $LOGFILE
echo "8<---------------------------------------------------"
exit 1
}
rm $LOGFILE
......
......@@ -164,7 +164,10 @@ try:
server.supervisor.stopProcess('burp-server', True)
except:
pass
server.supervisor.startProcess('burp-server', True)
try:
server.supervisor.startProcess('burp-server', True)
except:
pass
EOF
# configure nginx
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment