From ce0460a35a97cd1e81601656c91d7bfdc19d3346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Z=C3=B6ller?= Date: Wed, 5 Aug 2020 09:12:23 +0200 Subject: [PATCH] #18 - Unified handling of container creation --- src/clj_test_containers/core.clj | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/clj_test_containers/core.clj b/src/clj_test_containers/core.clj index 763f4ae..799a643 100644 --- a/src/clj_test_containers/core.clj +++ b/src/clj_test_containers/core.clj @@ -35,21 +35,12 @@ init)) (defn create-from-docker-file - [{:keys [exposed-ports env-vars command docker-file] - :or {docker-file "Dockerfile"}}] - (let [docker-image (-> (ImageFromDockerfile.) - (.withDockerfile (Paths/get "." (into-array [docker-file])))) - container (GenericContainer. docker-image)] - (.setExposedPorts container (map int exposed-ports)) - (if (some? env-vars) - (doseq [[k v] env-vars] - (.addEnv container k v))) - (if (some? command) - (.setCommand container command)) - {:container container - :exposed-ports (.getExposedPorts container) - :env-vars (.getEnvMap container) - :host (.getHost container)})) + "Creates a testcontainer from a provided Dockerfile" + [{:keys [docker-file] :as options}] + (->> (.withDockerfile (ImageFromDockerfile.) (Paths/get "." (into-array [docker-file]))) + (GenericContainer.) + (assoc options :container) + init)) (defn map-classpath-resource! "Maps a resource in the classpath to the given container path. Should be called before starting the container!"