From 79d816287051ac70fac74a8fac3633c941beca0c Mon Sep 17 00:00:00 2001 From: ziirish Date: Tue, 2 Jan 2018 10:17:50 +0100 Subject: [PATCH] upgrade demo --- .gitlab-ci.yml | 2 +- docker/demo/docker-burp1/Dockerfile | 2 +- docker/demo/docker-burp1/assets/setup/install | 1 + docker/demo/docker-burp2/Dockerfile | 2 +- docker/demo/docker-burp2/assets/setup/install | 1 + docker/demo/docker-burpui/Dockerfile | 2 +- docker/demo/docker-cli1/Dockerfile | 2 +- docker/demo/docker-cli2/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61fefa97..3f96d4f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,7 +121,7 @@ deploy:demo: - test -d /srv/demo/docker && rm -rf /srv/demo/docker - cp -r docker/demo/ /srv/demo/docker - cd /srv/demo/docker/ - - docker-compose build + - docker-compose build --pull - docker-compose stop - docker-compose rm -f - docker-compose up -d diff --git a/docker/demo/docker-burp1/Dockerfile b/docker/demo/docker-burp1/Dockerfile index 10c43ed0..ced7c349 100644 --- a/docker/demo/docker-burp1/Dockerfile +++ b/docker/demo/docker-burp1/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch MAINTAINER hi+burpui@ziirish.me RUN apt-get update \ diff --git a/docker/demo/docker-burp1/assets/setup/install b/docker/demo/docker-burp1/assets/setup/install index eaa13ae4..e6eba068 100755 --- a/docker/demo/docker-burp1/assets/setup/install +++ b/docker/demo/docker-burp1/assets/setup/install @@ -20,6 +20,7 @@ cd # Install burp-ui pip install --upgrade pip +pip install --upgrade setuptools pip install gevent pip install "requests[security]" pip install --upgrade cffi diff --git a/docker/demo/docker-burp2/Dockerfile b/docker/demo/docker-burp2/Dockerfile index 3c13f903..c3d639ad 100644 --- a/docker/demo/docker-burp2/Dockerfile +++ b/docker/demo/docker-burp2/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch MAINTAINER hi+burpui@ziirish.me RUN apt-get update \ diff --git a/docker/demo/docker-burp2/assets/setup/install b/docker/demo/docker-burp2/assets/setup/install index fc96cff3..5265e7e8 100755 --- a/docker/demo/docker-burp2/assets/setup/install +++ b/docker/demo/docker-burp2/assets/setup/install @@ -16,6 +16,7 @@ cd # Install burp-ui pip install --upgrade pip +pip install --upgrade setuptools pip install gevent pip install "requests[security]" pip install --upgrade cffi diff --git a/docker/demo/docker-burpui/Dockerfile b/docker/demo/docker-burpui/Dockerfile index d1208d8f..dac7a0c1 100644 --- a/docker/demo/docker-burpui/Dockerfile +++ b/docker/demo/docker-burpui/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch MAINTAINER hi+burpui@ziirish.me RUN apt-get update \ diff --git a/docker/demo/docker-cli1/Dockerfile b/docker/demo/docker-cli1/Dockerfile index b5c53dbf..61c4f7c0 100644 --- a/docker/demo/docker-cli1/Dockerfile +++ b/docker/demo/docker-cli1/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch MAINTAINER hi+burpui@ziirish.me RUN apt-get update \ diff --git a/docker/demo/docker-cli2/Dockerfile b/docker/demo/docker-cli2/Dockerfile index db0ca540..1f4b35a3 100644 --- a/docker/demo/docker-cli2/Dockerfile +++ b/docker/demo/docker-cli2/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch MAINTAINER hi+burpui@ziirish.me RUN apt-get update \