Merge PR #57: Add support for dockerfile_inline

Author: stephan

src/lib.rs

@@ -603,6 +603,8 @@ pub struct AdvancedBuildStep {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub dockerfile: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub dockerfile_inline: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub args: Option<BuildArgs>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub shm_size: Option<u64>,

tests/fixtures/dockerfile-inline/docker-compose.yml

@@ -0,0 +1,7 @@
+services:
+  busybox:
+    build:
+      context: .
+      dockerfile_inline: |
+        FROM busybox
+        RUN ls /

tests/mod.rs

@@ -106,3 +106,28 @@ volumes:
     }
     let _parsed: Container = from_str(v).unwrap();
 }
+
+#[test]
+fn parse_dockerfile_inline() {
+    use docker_compose_types::BuildStep;
+    use docker_compose_types::Compose;
+
+    let file_payload =
+        std::fs::read_to_string("tests/fixtures/dockerfile-inline/docker-compose.yml").unwrap();
+
+    let mut actual_parsed: Compose = from_str(&file_payload).unwrap();
+
+    let dockerfile_inline = actual_parsed
+        .services
+        .0
+        .swap_remove("busybox")
+        .flatten()
+        .and_then(|service| service.build_)
+        .map(|build_| match build_ {
+            BuildStep::Advanced(adv) => adv,
+            BuildStep::Simple(_) => panic!("Not advanced BuildStep"),
+        })
+        .and_then(|adv| adv.dockerfile_inline)
+        .expect("No dockerfile_inline");
+    assert!(dockerfile_inline.contains("FROM busybox"));
+}