infra: networking fixes (#386)

docker-compose.yml

@@ -1,11 +1,15 @@
-version: "3.5"
+version: "3.7"
 volumes:
   gateway-vol:
   postgres-vol:
 networks:
   user-net:
     driver: overlay
     attachable: true
+    ipam:
+      driver: default
+      config:
+        - subnet: 10.99.0.0/24
 services:
   gateway:
     image: "${CONTAINER_REGISTRY}/gateway:${BACKEND_TAG}"
@@ -19,6 +23,13 @@ services:
         condition: on-failure
         delay: 5s
         max_attempts: 3
+      update_config:
+        order: start-first
+        failure_action: rollback
+        delay: 10s
+      rollback_config:
+        parallelism: 0
+        order: stop-first
       placement:
         constraints:
           - node.hostname==controller
@@ -39,6 +50,7 @@ services:
       - "--image=${CONTAINER_REGISTRY}/deployer:${BACKEND_TAG}"
       - "--prefix=shuttle_"
       - "--network-name=${STACK}_user-net"
+      - "--docker-host=/var/run/docker.sock"
       - "--provisioner-host=provisioner"
       - "--proxy-fqdn=${APPS_FQDN}"
     healthcheck:
@@ -61,6 +73,13 @@ services:
         condition: on-failure
         delay: 5s
         max_attempts: 3
+      update_config:
+        order: start-first
+        failure_action: rollback
+        delay: 10s
+      rollback_config:
+        parallelism: 0
+        order: stop-first
       placement:
         constraints:
           - node.hostname==provisioner

gateway/src/args.rs

@@ -40,6 +40,9 @@ pub struct StartArgs {
     /// the provisioner service
     #[arg(long, default_value = "provisioner")]
     pub provisioner_host: String,
+    /// The path to the docker daemon socket
+    #[arg(long, default_value = "/var/run/docker.sock")]
+    pub docker_host: String,
     /// The Docker Network name in which to deploy user runtimes
     #[arg(long, default_value = "shuttle_default")]
     pub network_name: String,

gateway/src/service.rs

@@ -6,7 +6,7 @@ use axum::headers::{Authorization, HeaderMapExt};
 use axum::http::Request;
 use axum::response::Response;
 use bollard::network::ListNetworksOptions;
-use bollard::Docker;
+use bollard::{Docker, API_DEFAULT_VERSION};
 use hyper::client::connect::dns::GaiResolver;
 use hyper::client::HttpConnector;
 use hyper::Client;
@@ -182,7 +182,7 @@ impl GatewayService {
     /// * `args` - The [`Args`] with which the service was
     /// started. Will be passed as [`Context`] to workers and state.
     pub async fn init(args: StartArgs, fqdn: String, db: SqlitePool) -> Self {
-        let docker = Docker::connect_with_local_defaults().unwrap();
+        let docker = Docker::connect_with_unix(&args.docker_host, 60, API_DEFAULT_VERSION).unwrap();
 
         let container_settings = ContainerSettings::builder(&docker, fqdn)
             .from_args(&args)