fix demo build

.gitlab-ci.yml

@@ -123,6 +123,7 @@ build:docker:demo:
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
   - docker build --pull -t $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:demo -f docker/Dockerfile .
   - docker push $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:demo
+  - apk add --no-cache curl
   - "curl $SENTRY_WEBHOOK -X POST -H 'Content-Type: application/json' -d '{\"version\": \"'$CI_COMMIT_REF_NAME'_'$CI_COMMIT_SHA'\"}'"
   only:
   - demo@ziirish/burp-ui
@@ -138,8 +139,7 @@ deploy:demo:
   - test -d /srv/demo/docker && rm -rf /srv/demo/docker
   - cp -r docker/demo/ /srv/demo/docker
   - cd /srv/demo/docker/
-# old docker client, we need the "-e" flag
-  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN -e $DUMMY_EMAIL $CI_REGISTRY
+  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
   - docker-compose build --pull
   - docker-compose stop
   - docker-compose rm -f

docker/Dockerfile

@@ -4,8 +4,8 @@ RUN apk add --no-cache supervisor 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.0.54.tar.gz \
-	&& wget -O uthash.tar.gz https://github.com/troydhanson/uthash/archive/v2.0.1.tar.gz \
+	&& wget -O burp.tar.gz https://github.com/grke/burp/archive/2.2.18.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 \
 	&& tar -xC /usr/src/uthash --strip-components=1 -f uthash.tar.gz \

docker/docker-alpine/assets/setup/install

@@ -23,7 +23,6 @@ cd /burp-ui
 git submodule update --init
 pip install -r requirements.txt
 python setup.py sdist
-pip install ujson
 pip install gunicorn
 pip install gevent
 pip install gevent-websocket