From fa374f38353acc6be5c11a642fb366033c0505c4 Mon Sep 17 00:00:00 2001
From: Kieren Davies <kieren@kdavi.es>
Date: Thu, 16 Mar 2023 20:44:45 +0100
Subject: [PATCH] chore: Update bollard to v0.14.0

---
 Cargo.lock                              | 42 ++++++++++++++++++++-----
 Cargo.toml                              |  1 +
 cargo-shuttle/Cargo.toml                |  2 +-
 cargo-shuttle/src/provisioner_server.rs |  1 +
 gateway/Cargo.toml                      |  2 +-
 gateway/src/project.rs                  |  1 +
 6 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1a2d638aaa..f80fc95ce8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -746,11 +746,11 @@ dependencies = [
 
 [[package]]
 name = "bollard"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82e7850583ead5f8bbef247e2a3c37a19bd576e8420cd262a6711921827e1e5"
+checksum = "af254ed2da4936ef73309e9597180558821cb16ae9bba4cb24ce6b612d8d80ed"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.21.0",
  "bollard-stubs",
  "bytes",
  "futures-core",
@@ -764,6 +764,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
+ "serde_repr",
  "serde_urlencoded",
  "thiserror",
  "tokio",
@@ -774,12 +775,12 @@ dependencies = [
 
 [[package]]
 name = "bollard-stubs"
-version = "1.42.0-rc.3"
+version = "1.42.0-rc.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed59b5c00048f48d7af971b71f800fdf23e858844a6f9e4d32ca72e9399e7864"
+checksum = "602bda35f33aeb571cef387dcd4042c643a8bf689d8aaac2cc47ea24cb7bc7e0"
 dependencies = [
  "serde",
- "serde_with",
+ "serde_with 2.3.1",
 ]
 
 [[package]]
@@ -3383,7 +3384,7 @@ dependencies = [
  "rustls-pemfile",
  "serde",
  "serde_bytes",
- "serde_with",
+ "serde_with 1.14.0",
  "sha-1",
  "sha2 0.10.2",
  "socket2",
@@ -4770,6 +4771,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_repr"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "395627de918015623b32e7669714206363a7fc00382bf477e72c1f7533e8eafc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "serde_spanned"
 version = "0.6.1"
@@ -4801,6 +4813,21 @@ dependencies = [
  "serde_with_macros",
 ]
 
+[[package]]
+name = "serde_with"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85456ffac572dc8826334164f2fb6fb40a7c766aebe195a2a21ee69ee2885ecf"
+dependencies = [
+ "base64 0.13.1",
+ "chrono",
+ "hex 0.4.3",
+ "indexmap",
+ "serde",
+ "serde_json",
+ "time",
+]
+
 [[package]]
 name = "serde_with_macros"
 version = "1.5.2"
@@ -5712,6 +5739,7 @@ dependencies = [
  "itoa",
  "libc",
  "num_threads",
+ "serde",
  "time-macros",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index a479f3bd6b..87a9fb629e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,6 +40,7 @@ shuttle-service = { path = "service", version = "0.12.0" }
 anyhow = "1.0.66"
 async-trait = "0.1.58"
 axum = { version = "0.6.0", default-features = false }
+bollard = "0.14.0"
 cargo = "0.69.0"
 cargo_metadata = "0.15.3"
 chrono = { version = "0.4.23", default-features = false }
diff --git a/cargo-shuttle/Cargo.toml b/cargo-shuttle/Cargo.toml
index a50dde96f9..ae7cb43c9f 100644
--- a/cargo-shuttle/Cargo.toml
+++ b/cargo-shuttle/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://www.shuttle.rs"
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
-bollard = "0.13.0"
+bollard = { workspace = true }
 cargo = { workspace = true }
 cargo-edit = { version = "0.11.9", features = ["cli"] }
 cargo_metadata = { workspace = true }
diff --git a/cargo-shuttle/src/provisioner_server.rs b/cargo-shuttle/src/provisioner_server.rs
index 3981c70f24..0409d6e1ed 100644
--- a/cargo-shuttle/src/provisioner_server.rs
+++ b/cargo-shuttle/src/provisioner_server.rs
@@ -82,6 +82,7 @@ impl LocalProvisioner {
                 trace!("will create DB container {container_name}");
                 let options = Some(CreateContainerOptions {
                     name: container_name.clone(),
+                    platform: None,
                 });
                 let mut port_bindings = HashMap::new();
                 let host_port = pick_unused_port().expect("system to have a free port");
diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml
index 8dff34af60..f0ecd3c649 100644
--- a/gateway/Cargo.toml
+++ b/gateway/Cargo.toml
@@ -11,7 +11,7 @@ async-trait = { workspace = true }
 axum = { workspace = true, features = [ "default", "headers" ] }
 axum-server = { version = "0.4.4", features = [ "tls-rustls" ] }
 base64 = "0.13.1"
-bollard = "0.13.0"
+bollard = { workspace = true }
 chrono = { workspace = true }
 clap = { workspace = true }
 fqdn = "0.2.3"
diff --git a/gateway/src/project.rs b/gateway/src/project.rs
index 6c2d3200fe..e5c8ed01b4 100644
--- a/gateway/src/project.rs
+++ b/gateway/src/project.rs
@@ -681,6 +681,7 @@ impl ProjectCreating {
 
         let create_container_options = CreateContainerOptions {
             name: self.container_name(ctx),
+            platform: None,
         };
 
         let container_config = self