fix several dependencies issues thanks to @monofox (fix #339, #343)

CONTRIBUTORS

@@ -12,5 +12,6 @@ Graham Keeling (main author of Burp)
 larsen0815
 Johannes Lerch
 slarti5191
+Lukas Schreiner
 Robert Tichy
 Benjamin `ziirish` SANS (main author)

burpui/__main__.py

@@ -240,7 +240,7 @@ def celery():
     env["BUI_MODE"] = "celery"
     env["BUI_CONFIG"] = conf
 
-    args = ["celery", celery_mode, "-A", "engines.worker.celery"]
+    args = ["celery", "-A", "engines.worker.celery", celery_mode]
     args += unknown
     args += [x for x in options.remaining if x != "--"]
 

burpui/static/vendor

@@ -1 +1 @@
-Subproject commit 8a343173cd3b7fd07a27579ff291fb144f594a2e
+Subproject commit 9ae580dd670e16fc5e501e25a118febaf7687f46

docker/Dockerfile

@@ -1,10 +1,10 @@
-FROM python:3.7-alpine3.10
+FROM python:3.7-alpine3.12
 
 RUN apk add --no-cache supervisor bash logrotate librsync libressl tzdata nginx \
 	&& apk add --no-cache --virtual .fetch-deps \
 		tar \
 	\
-	&& wget -O burp.tar.gz https://github.com/grke/burp/archive/2.2.18.tar.gz \
+	&& wget -O burp.tar.gz https://github.com/grke/burp/archive/2.4.0.tar.gz \
 	&& wget -O uthash.tar.gz https://github.com/troydhanson/uthash/archive/v2.1.0.tar.gz \
 	&& mkdir -p /usr/src/burp /usr/src/uthash \
 	&& tar -xC /usr/src/burp --strip-components=1 -f burp.tar.gz \
@@ -23,6 +23,8 @@ RUN apk add --no-cache supervisor bash logrotate librsync libressl tzdata nginx
 		autoconf \
 		automake \
 		libtool \
+		bsd-compat-headers \
+		linux-headers \
 	\
 # add build deps before removing fetch deps in case there's overlap
 	&& apk del .fetch-deps \

docker/components/docker-burp/Dockerfile

@@ -1,6 +1,6 @@
-FROM alpine:3.10
+FROM alpine:3.12
 
-ARG BURP_VERSION=2.2.18
+ARG BURP_VERSION=2.4.0
 ARG UTHASH_VERSION=2.1.0
 
 RUN apk add --no-cache supervisor bash logrotate librsync libressl tzdata bash coreutils \
@@ -26,6 +26,8 @@ RUN apk add --no-cache supervisor bash logrotate librsync libressl tzdata bash c
 		autoconf \
 		automake \
 		libtool \
+		bsd-compat-headers \
+		linux-headers \
 	\
 # add build deps before removing fetch deps in case there's overlap
 	&& apk del .fetch-deps \

docker/docker-alpine/assets/setup/install

@@ -14,7 +14,9 @@ apk add --no-cache --virtual .build-deps \
 	gcc \
 	libc-dev \
 	postgresql-dev \
-	make
+	make \
+	cargo \
+	g++
 
 apk add --no-cache mariadb-connector-c libpq
 

setup.py

@@ -86,7 +86,7 @@ VENDOR_TO_KEEP = [
     "burpui/static/vendor/components-font-awesome/fonts/fontawesome-webfont.ttf",
     "burpui/static/vendor/components-font-awesome/fonts/fontawesome-webfont.woff",
     "burpui/static/vendor/components-font-awesome/fonts/fontawesome-webfont.woff2",
-    "burpui/static/vendor/socket.io-client/dist/socket.io.js",
+    "burpui/static/vendor/socket.io-client/dist/socket.io.min.js",
     "burpui/static/vendor/js-cookie/src/js.cookie.js",
     "burpui/static/vendor/ace-builds/src-min-noconflict/ace.js",
     "burpui/static/vendor/ace-builds/src-min-noconflict/mode-json.js",