From 8ceb878d596e23e688d0fd0f2d432d159f135feb Mon Sep 17 00:00:00 2001
From: ziirish <ziirish@ziirish.info>
Date: Fri, 27 Apr 2018 15:07:02 +0200
Subject: [PATCH] try to fix demo build

---
 .gitlab-ci.yml                                | 15 +++++++++++++++
 docker/demo/docker-burp1/assets/setup/install |  7 +++----
 docker/demo/docker-burp2/assets/setup/install |  5 ++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18419650..fc8be2fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,6 +121,21 @@ build:docker:release:
   tags:
   - registry
 
+build:docker:stable:
+  stage: build
+  script:
+  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+  - docker build --pull -t $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:stable -f docker/Dockerfile .
+  - (cd docker/demo/docker-pg && docker build --pull -t $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/pgsql:10 .)
+  - (cd docker/components/docker-burp && docker build --pull -t $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/burp:2.0.54 .)
+  - docker push $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:stable
+  - docker push $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/pgsql:10
+  - docker push $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/burp:2.0.54
+  only:
+  - stable
+  tags:
+  - registry
+
 build:docker:demo:
   stage: build
   script:
diff --git a/docker/demo/docker-burp1/assets/setup/install b/docker/demo/docker-burp1/assets/setup/install
index 2e1cc85b..dda59970 100755
--- a/docker/demo/docker-burp1/assets/setup/install
+++ b/docker/demo/docker-burp1/assets/setup/install
@@ -23,15 +23,14 @@ apt-get install -y libssl-dev
 cd
 
 # Install burp-ui
+# FIXME: pip 10 is kind of broken
 pip install --upgrade pip
 pip install --upgrade setuptools
 pip install gevent
-#pip install "requests[security]"
-#pip install --upgrade cffi
 pip install --upgrade $BURPUI
 pip install ujson
-pip install ipaddress
-pip install enum34
+#pip install ipaddress
+#pip install enum34
 
 # Create burp-ui User
 useradd -m -s /bin/bash -d /var/lib/burpui -c 'Burp-UI daemon user' -u 5337 burpui
diff --git a/docker/demo/docker-burp2/assets/setup/install b/docker/demo/docker-burp2/assets/setup/install
index c2f46c2f..46ddc861 100755
--- a/docker/demo/docker-burp2/assets/setup/install
+++ b/docker/demo/docker-burp2/assets/setup/install
@@ -16,11 +16,10 @@ apt-get install -y burp-server burp-client libssl-dev
 cd
 
 # Install burp-ui
-pip install --upgrade pip
+# FIXME: pip 10 is kind of broken
+#pip install --upgrade pip
 pip install --upgrade setuptools
 pip install gevent
-#pip install "requests[security]"
-#pip install --upgrade cffi
 pip install --upgrade $BURPUI
 pip install ujson