Permalink
Browse files

Merge branch 'master' into update-to-hyper-0.12

  • Loading branch information...
abusch committed Sep 29, 2018
2 parents 3e2a40c + eec5876 commit 36ef9c5800e2828c6be9d84b5922baf0f7bc5f95
Showing with 240 additions and 258 deletions.
  1. +2 −0 .gitignore
  2. +5 −1 Cargo.toml
  3. +5 −0 src/builder.rs
  4. +155 −182 src/lib.rs
  5. +3 −2 src/rep.rs
  6. +70 −73 src/transport.rs
@@ -1,3 +1,5 @@
*.bk
target
Cargo.lock

.idea
@@ -16,7 +16,7 @@ flate2 = "0.2"
http = "0.1"
hyper = "0.12"
hyper-openssl = "0.6"
hyperlocal = "0.6"
hyperlocal = { version = "0.6", optional = true }
jed = "0.1"
log = "0.3"
mime = "0.3"
@@ -30,3 +30,7 @@ serde_derive = "1.0"

[dev-dependencies]
env_logger = "0.4.0"

[features]
default = ["unix-socket"]
unix-socket = ["hyperlocal"]
@@ -418,6 +418,11 @@ impl ContainerOptionsBuilder {
self
}

pub fn memory(&mut self, memory: u64) -> &mut ContainerOptionsBuilder {
self.params.insert("HostConfig.Memory", Json::U64(memory));
self
}

pub fn labels(&mut self, labels: &HashMap<&str, &str>) -> &mut ContainerOptionsBuilder {

let mut json_labels : BTreeMap<String, Json> = BTreeMap::new();
Oops, something went wrong.

0 comments on commit 36ef9c5

Please sign in to comment.