improve demo setup

.gitlab-ci.yml

@@ -50,3 +50,17 @@ build:py3:
 #  artifacts:
 #    paths:
 #    - dist/
+
+deploy:demo:
+  stage: deploy
+  script:
+  - cd docker/
+  - find . -name "install" | xargs sed -i "s/@build@/$(git rev-parse HEAD)/"
+  - docker-compose build
+  - docker-compose stop
+  - docker-compose up -d
+  tags:
+  - deploy
+  only:
+  - rc
+  - demo

docker/README.rst

+Docker Images
+=============
+
+Here are the `docker`_ model used to build the demo.
+
+Howto
+-----
+
+In order to build the demo on your own infrastructure you have to run the
+following commands:
+
+::
+
+        docker-compose build
+        docker-compose up -d
+
+
+.. _docker: https://www.docker.com/

docker/docker-burp1/assets/setup/install

 #!/bin/bash
+# Build: @build@
 set -e
 
 SETUP_DIR="/app/setup"

docker/docker-burp2/assets/setup/install

 #!/bin/bash
+# Build: @build@
 set -e
 
 SETUP_DIR="/app/setup"

docker/docker-cli1/assets/setup/install

@@ -43,8 +43,8 @@ EOF
 cp ${CONFIG_DIR}/burp/* /etc/burp/
 
 cat >>/etc/crontab<<EOF
-12 1,3,5,7,9,11,13,15,17,19,21,23 * * * root burp -c /etc/burp/demo1.conf -a t &>/dev/null
-47 0,2,4,6,8,10,12,14,16,18,20,22 * * * root burp -c /etc/burp/demo2.conf -a t &>/dev/null
+42 3,7,11,15,19,23 * * * root burp -c /etc/burp/demo1.conf -a t &>/dev/null
+17 2,6,10,14,18,22 * * * root burp -c /etc/burp/demo2.conf -a t &>/dev/null
 EOF
 
 # cleanup

docker/docker-cli2/assets/setup/install

@@ -44,8 +44,8 @@ EOF
 cp ${CONFIG_DIR}/burp/* /etc/burp/
 
 cat >>/etc/crontab<<EOF
-54 1,3,5,7,9,11,13,15,17,19,21,23 * * * root burp -c /etc/burp/demo3.conf -a t &>/dev/null
-29 0,2,4,6,8,10,12,14,16,18,20,22 * * * root burp -c /etc/burp/demo4.conf -a t &>/dev/null
+24 1,5,9,13,17,21 * * * root burp -c /etc/burp/demo3.conf -a t &>/dev/null
+59 0,4,8,12,16,20 * * * root burp -c /etc/burp/demo4.conf -a t &>/dev/null
 EOF
 
 # cleanup

docker/docker-compose.yml

@@ -5,6 +5,7 @@ demo-burp1:
     - /srv/demo/spool/burp1/backup:/var/spool/burp
     - /srv/demo/spool/burp1/tmp:/tmp/bui
     - /srv/demo/conf/burp1/clients:/etc/burp/clientconfdir
+
 demo-burp2:
   restart: always
   build: docker-burp2/
@@ -12,23 +13,27 @@ demo-burp2:
     - /srv/demo/spool/burp2/backup:/var/spool/burp
     - /srv/demo/spool/burp2/tmp:/tmp/bui
     - /srv/demo/conf/burp2/clients:/etc/burp/clientconfdir
+
 demo-redis:
   restart: always
   image: sameersbn/redis:latest
+
 demo-cli1:
   restart: always
   build: docker-cli1/
   volumes:
     - /srv/demo/files:/home
   links:
-    - demo-burp1:demo-burp1
+    - demo-burp1
+
 demo-cli2:
   restart: always
   build: docker-cli2/
   volumes:
     - /srv/demo/files:/home
   links:
-    - demo-burp2:demo-burp2
+    - demo-burp2
+
 demo-bui:
   restart: always
   build: docker-burpui/
@@ -37,6 +42,6 @@ demo-bui:
   ports:
     - 5000:5000
   links:
-    - demo-redis:demo-redis
-    - demo-burp1:demo-burp1
-    - demo-burp2:demo-burp2
+    - demo-redis
+    - demo-burp1
+    - demo-burp2