Switch BBM deployment to Host Networking

docker-compose/.env.dev

@@ -3,7 +3,7 @@ TITLE_URL=https://github.com/MariaDB/server
 BUILDMASTER_URL=https://buildbot.dev.mariadb.org/
 CR_HOST_WG_ADDR="hz-bbw5=127.0.0.1"
 BUILDMASTER_WG_IP=100.64.101.1
-MQ_ROUTER_URL=ws://crossbar:8080/ws
+MQ_ROUTER_URL=ws://127.0.0.1:8080/ws
 MASTER_PACKAGES_DIR="/mnt/autofs/master_dev_packages"
 GALERA_PACKAGES_DIR="/mnt/autofs/galera_dev_packages"
 ARTIFACTS_URL="https://ci.dev.mariadb.org"

docker-compose/docker-compose.yaml

@@ -13,15 +13,11 @@ services:
       - MARIADB_DATABASE=buildbot
       - MARIADB_USER=buildmaster
       - MARIADB_PASSWORD=password
-    networks:
-      net_back:
+    network_mode: host
     healthcheck:
       test: ['CMD', "mariadb-admin", "--password=password", "--protocol", "tcp", "ping"]
     volumes:
-    # Only needed during GSOC
-    # - ./db:/docker-entrypoint-initdb.d:ro
       - ./mariadb:/var/lib/mysql:rw
-    # command: --tmpdir=/var/lib/mysql/tmp
     logging:
       driver: journald
       options:
@@ -32,8 +28,7 @@ services:
     restart: unless-stopped
     container_name: crossbar
     hostname: crossbar
-    networks:
-      net_back:
+    network_mode: host
     logging:
       driver: journald
       options:
@@ -46,7 +41,6 @@ services:
     hostname: nginx
     volumes:
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-      - ./nginx/proxy_params:/etc/nginx/proxy_params:ro
       - ./nginx/conf.d/:/etc/nginx/conf.d/
       - ./nginx/templates/:/etc/nginx/templates/:ro
       - /srv/buildbot/packages:/srv/buildbot/packages:ro
@@ -55,27 +49,24 @@ services:
       - ./logs/nginx:/var/log/nginx
       - ./certbot/www/:/var/www/certbot/:ro
       - ./certbot/conf/:/etc/nginx/ssl/:ro
-    ports:
-      - "443:443"
-      - "80:80"
     environment:
       - NGINX_ARTIFACTS_VHOST
       - NGINX_BUILDBOT_VHOST
-    networks:
-      net_front:
-      net_back:
+    network_mode: host
     logging:
       driver: journald
       options:
         tag: "bb-nginx"
 
   certbot:
     image: certbot/certbot:latest
+    restart: "no"
+    container_name: certbot
+    hostname: certbot
     volumes:
       - ./certbot/www/:/var/www/certbot/:rw
       - ./certbot/conf/:/etc/letsencrypt/:rw
-    networks:
-      net_front:
+    network_mode: host
 
   master-web:
     image: quay.io/mariadb-foundation/bb-master:master-web
@@ -105,9 +96,7 @@ services:
       - ./buildbot/:/srv/buildbot/master
     entrypoint:
       - /srv/buildbot/master/docker-compose/start-bbm-web.sh
-    networks:
-      net_back:
-      net_front:
+    network_mode: host
     depends_on:
       - mariadb
       - crossbar
@@ -143,11 +132,7 @@ services:
       - /bin/bash
       - -c
       - "/srv/buildbot/master/docker-compose/start.sh master-nonlatent"
-    networks:
-      net_front:
-      net_back:
-    ports:
-      - "100.64.101.1:9996:9996"
+    network_mode: host
     depends_on:
       - mariadb
       - crossbar
@@ -182,11 +167,7 @@ services:
       - /bin/bash
       - -c
       - "/srv/buildbot/master/docker-compose/start.sh master-libvirt"
-    networks:
-      net_front:
-      net_back:
-    ports:
-      - "100.64.101.1:9997:9997"
+    network_mode: host
     depends_on:
       - mariadb
       - crossbar
@@ -221,11 +202,7 @@ services:
       - /bin/bash
       - -c
       - "/srv/buildbot/master/docker-compose/start.sh autogen/aarch64-master-0"
-    networks:
-      net_front:
-      net_back:
-    ports:
-      - "100.64.101.1:9998:9998"
+    network_mode: host
     depends_on:
       - mariadb
       - crossbar
@@ -260,11 +237,7 @@ services:
       - /bin/bash
       - -c
       - "/srv/buildbot/master/docker-compose/start.sh autogen/amd64-master-0"
-    networks:
-      net_front:
-      net_back:
-    ports:
-      - "100.64.101.1:9999:9999"
+    network_mode: host
     depends_on:
       - mariadb
       - crossbar
@@ -299,11 +272,7 @@ services:
       - /bin/bash
       - -c
       - "/srv/buildbot/master/docker-compose/start.sh autogen/amd64-master-1"
-    networks:
-      net_front:
-      net_back:
-    ports:
-      - "100.64.101.1:10000:10000"
+    network_mode: host
     depends_on:
       - mariadb
       - crossbar
@@ -338,11 +307,7 @@ services:
       - /bin/bash
       - -c
       - "/srv/buildbot/master/docker-compose/start.sh autogen/ppc64le-master-0"
-    networks:
-      net_front:
-      net_back:
-    ports:
-      - "100.64.101.1:10001:10001"
+    network_mode: host
     depends_on:
       - mariadb
       - crossbar
@@ -377,11 +342,7 @@ services:
       - /bin/bash
       - -c
       - "/srv/buildbot/master/docker-compose/start.sh autogen/s390x-master-0"
-    networks:
-      net_front:
-      net_back:
-    ports:
-      - "100.64.101.1:10002:10002"
+    network_mode: host
     depends_on:
       - mariadb
       - crossbar
@@ -416,11 +377,7 @@ services:
       - /bin/bash
       - -c
       - "/srv/buildbot/master/docker-compose/start.sh autogen/x86-master-0"
-    networks:
-      net_front:
-      net_back:
-    ports:
-      - "100.64.101.1:10003:10003"
+    network_mode: host
     depends_on:
       - mariadb
       - crossbar
@@ -455,11 +412,7 @@ services:
       - /bin/bash
       - -c
       - "/srv/buildbot/master/docker-compose/start.sh master-docker-nonstandard"
-    networks:
-      net_front:
-      net_back:
-    ports:
-      - "100.64.101.1:10004:10004"
+    network_mode: host
     depends_on:
       - mariadb
       - crossbar
@@ -494,11 +447,7 @@ services:
       - /bin/bash
       - -c
       - "/srv/buildbot/master/docker-compose/start.sh master-galera"
-    networks:
-      net_front:
-      net_back:
-    ports:
-      - "100.64.101.1:10005:10005"
+    network_mode: host
     depends_on:
       - mariadb
       - crossbar
@@ -533,11 +482,7 @@ services:
       - /bin/bash
       - -c
       - "/srv/buildbot/master/docker-compose/start.sh master-protected-branches"
-    networks:
-      net_front:
-      net_back:
-    ports:
-      - "100.64.101.1:10006:10006"
+    network_mode: host
     depends_on:
       - mariadb
       - crossbar
@@ -572,11 +517,7 @@ services:
       - /bin/bash
       - -c
       - "/srv/buildbot/master/docker-compose/start.sh master-docker-nonstandard-2"
-    networks:
-      net_front:
-      net_back:
-    ports:
-      - "100.64.101.1:10007:10007"
+    network_mode: host
     depends_on:
       - mariadb
       - crossbar
@@ -611,32 +552,7 @@ services:
       - /bin/bash
       - -c
       - "/srv/buildbot/master/docker-compose/start.sh master-bintars"
-    networks:
-      net_front:
-      net_back:
-    ports:
-      - "100.64.101.1:10008:10008"
+    network_mode: host
     depends_on:
       - mariadb
       - crossbar
-
-networks:
-  net_front:
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-        - subnet: 172.200.0.0/24
-    driver_opts:
-      com.docker.network.enable_ipv6: "false"
-      com.docker.network.bridge.name: "br_bb_front"
-  net_back:
-    driver: bridge
-    internal: true
-    ipam:
-      driver: default
-      config:
-        - subnet: 172.16.201.0/24
-    driver_opts:
-      com.docker.network.enable_ipv6: "false"
-      com.docker.network.bridge.name: "br_bb_back"