Merge branch 'docker-hub' into 'master'

use docker hub images

See merge request sre18/break-it!16

.gitlab-ci.yml

@@ -30,7 +30,7 @@ groupB:
     - docker:dind
   script:
     - dockerfiles/B/build.sh
-    - python3 run.py testing.marschke.me 9001 smtp-server-group-b 8008
+    - python3 run.py testing.marschke.me 9001 sregroupb/smtp-server 8008
   allow_failure: true
 
 groupC:
@@ -39,7 +39,7 @@ groupC:
     - docker:dind
   script:
     - dockerfiles/C/build.sh
-    - python3 run.py testing.marschke.me 9001 smtp-server-group-c 5555
+    - python3 run.py testing.marschke.me 9001 sregroupc/smtp-server 5555
   allow_failure: true
 
 groupD:
@@ -48,7 +48,7 @@ groupD:
     - docker:dind
   script:
     - dockerfiles/D/build.sh
-    - python3 run.py testing.marschke.me 9001 smtp-server-group-d 25
+    - python3 run.py testing.marschke.me 9001 sregroupd/sre-smtp-group-d 25
   allow_failure: true
 
 groupE:
@@ -56,5 +56,6 @@ groupE:
   services:
     - docker:dind
   script:
+    - dockerfiles/E/build.sh
     - python3 run.py testing.marschke.me 9001 julianweise/simplesmtp 4431 --ssl --wait-up 2
   allow_failure: true

dockerfiles/B/build.sh

@@ -2,6 +2,8 @@
 
 set -e
 
-curl https://owncloud.hpi.de/index.php/s/9uitNpBSCxaOLCt/download > Dockerfile
-docker build --no-cache --tag smtp-server-group-b .
+docker pull sregroupb/smtp-server
+
+#curl https://owncloud.hpi.de/index.php/s/9uitNpBSCxaOLCt/download > Dockerfile
+#docker build --no-cache --tag smtp-server-group-b .
 

dockerfiles/B/run.sh

 #!/usr/bin/env bash
 
-docker run -it --rm -p 8002:8008 smtp-server-group-b
+docker run -it --rm -p 8002:8008 sregroupb/smtp-server

dockerfiles/C/build.sh

@@ -2,6 +2,8 @@
 
 set -e
 
-curl https://raw.githubusercontent.com/lawben/sre-smtp/master/Dockerfile > Dockerfile
-docker build --no-cache --tag smtp-server-group-c .
+docker pull sregroupc/smtp-server
+
+#curl https://raw.githubusercontent.com/lawben/sre-smtp/master/Dockerfile > Dockerfile
+#docker build --no-cache --tag smtp-server-group-c .
 

dockerfiles/C/run.sh

 #!/usr/bin/env bash
-docker run --rm -it -p 8003:5555 smtp-server-group-c
+docker run --rm -it -p 8003:5555 sregroupc/smtp-server

dockerfiles/D/build.sh

@@ -2,5 +2,7 @@
 
 set -e
 
-curl -k --header "PRIVATE-TOKEN: TWc2wdsw4A-CbzZMHYu2" "https://gitlab.hpi.de/patrick.jattke/sw-reliability-eng/raw/master/docker/dockerfile" > Dockerfile
-docker build --no-cache --tag smtp-server-group-d .
+docker pull sregroupd/sre-smtp-group-d
+
+#curl -k --header "PRIVATE-TOKEN: TWc2wdsw4A-CbzZMHYu2" "https://gitlab.hpi.de/patrick.jattke/sw-reliability-eng/raw/master/docker/dockerfile" > Dockerfile
+#docker build --no-cache --tag smtp-server-group-d .

dockerfiles/D/run.sh

 #!/usr/bin/env bash
 #docker run --rm -v /tmp/localMailbox:/root/SMTP_mails -p 25:25 smtp-server-group-d
-docker run --rm -it -p 8004:25 smtp-server-group-d
+docker run --rm -it -p 8004:25 sregroupd/sre-smtp-group-d