Docker-Praefect.md

@@ -473,53 +473,54 @@ done
 ```
 VER=13.12.15
 
-for i in 1 2 3 ; do
-  for j in praefect gitaly ; do
-    sudo docker stop gitlab-testgyc1-${j}${i}
+for j in praefect gitaly postgresql  ; do
+  for i in 0 1 2 3 ; do
+    if [ $i -eq 0 ] && [ "$j" != "postgresql" ] ; then
+      :
+    elif [ $i -ne 0 ] && [ "$j" = "postgresql" ]; then
+      echo "gitlab-testgyc1-${j}${i} (skipping postgresql)"
+    elif [ $i -ne 1 ] && [ "$j" = "praefect" ]; then
+      echo "gitlab-testgyc1-${j}${i} (skipping praefect)"
+    else
+      docker stop  gitlab-testgyc1-${j}${i} 
+    fi
   done
 done
-j=postgresql i=0 docker stop  gitlab-testgyc1-${j}${i}
-```
-
 ```
-for i in 1 2 3 ; do
-
-
-sudo docker rm gitlab-testgyc1-xx${i}
 
-sudo docker run --detach \
-##tbc
-  gitlab/gitlab-ee:${VER}-ee.0
-
-#tbc# docker exec -it gitlab-testgyc1-xx${i}  /bin/rm -rf /opt/gitlab/sv/sshd
-
-done
 ```
+for j in postgresql  gitaly praefect    ; do
+  for i in 0 1 2 3 ; do
+    if [ $i -eq 0 ] && [ "$j" != "postgresql" ] ; then
+      :
+    elif [ $i -ne 0 ] && [ "$j" = "postgresql" ]; then
+      echo "gitlab-testgyc1-${j}${i} (skipping postgresql)"
+    elif [ $i -ne 1 ] && [ "$j" = "praefect" ]; then
+      echo "gitlab-testgyc1-${j}${i} (skipping praefect)"
+    else
+      [ "$j" = "postgresql" ] && k=0
+      [ "$j" = "praefect" ] && k=1
+      [ "$j" = "gitaly" ] && k=2
 
-```
-for i in 1 2 3 ; do
+      echo -e "gitlab-testgyc1-${j}${i} (172.18.1.1${k}${i})"
 
-sudo docker rm gitlab-testgyc1-xx${i}
+sudo docker rm gitlab-testgyc1-${j}${i}
 
 sudo docker run --detach \
-##tbc
+  --hostname gitlab-testgyc1-${j}${i}.watertower \
+  --network praefect \
+  --ip 172.18.1.1${k}${i} \
+  --name gitlab-testgyc1-${j}${i}  \
+  --restart always \
+  --volume /var/opt/docker/testgyc1/${j}${i}/config:/etc/gitlab:Z \
+  --volume /var/opt/docker/testgyc1/${j}${i}/logs:/var/log/gitlab:Z \
+  --volume /var/opt/docker/testgyc1/${j}${i}/data:/var/opt/gitlab:Z \
   gitlab/gitlab-ee:${VER}-ee.0
 
-#tbc# docker exec -it gitlab-testgyc1-xx${i}   /bin/rm -rf /opt/gitlab/sv/sshd
+docker exec -it gitlab-testgyc1-xx${i}  /bin/rm -rf /opt/gitlab/sv/sshd
+docker exec -it  gitlab-testgyc1-${j}${i} cp /etc/gitlab/trusted-certs/root20190513.pki.watertower.crt  /usr/local/share/ca-certificates/
+docker exec -it  gitlab-testgyc1-${j}${i} update-ca-certificates
 
 done
 ```
 
-```
-for i in 1 2 3 ; do
-
-sudo docker rm gitlab-testgyc1-xx${i} 
-
-sudo docker run --detach \
-#tbc
-  gitlab/gitlab-ee:${VER}-ee.0
-
-#tbc# docker exec -it gitlab-testgyc1-xx${i}  /bin/rm -rf /opt/gitlab/sv/sshd
-
-done
-```
\ No newline at end of file