diff --git a/src/docker_clojure/dockerfile.clj b/src/docker_clojure/dockerfile.clj index cabb7b9e..a61db835 100644 --- a/src/docker_clojure/dockerfile.clj +++ b/src/docker_clojure/dockerfile.clj @@ -5,7 +5,7 @@ [docker-clojure.dockerfile.boot :as boot] [docker-clojure.dockerfile.lein :as lein] [docker-clojure.dockerfile.tools-deps :as tools-deps] - [docker-clojure.dockerfile.shared :refer :all])) + [docker-clojure.dockerfile.shared :refer [copy-resource-file! entrypoint]])) (defn build-dir [{:keys [base-image-tag jdk-version build-tool]}] (str/join "/" ["target" diff --git a/src/docker_clojure/dockerfile/boot.clj b/src/docker_clojure/dockerfile/boot.clj index 666f4e7a..00be91fc 100644 --- a/src/docker_clojure/dockerfile/boot.clj +++ b/src/docker_clojure/dockerfile/boot.clj @@ -1,5 +1,7 @@ (ns docker-clojure.dockerfile.boot - (:require [docker-clojure.dockerfile.shared :refer :all])) + (:require [docker-clojure.dockerfile.shared + :refer [concat-commands entrypoint install-distro-deps + uninstall-distro-build-deps]])) (defn prereqs [_ _] nil) diff --git a/src/docker_clojure/dockerfile/lein.clj b/src/docker_clojure/dockerfile/lein.clj index 9abce3ed..313f5ffd 100644 --- a/src/docker_clojure/dockerfile/lein.clj +++ b/src/docker_clojure/dockerfile/lein.clj @@ -1,5 +1,7 @@ (ns docker-clojure.dockerfile.lein - (:require [docker-clojure.dockerfile.shared :refer :all])) + (:require [docker-clojure.dockerfile.shared + :refer [concat-commands entrypoint install-distro-deps + uninstall-distro-build-deps]])) (defn prereqs [_ _] nil) diff --git a/src/docker_clojure/dockerfile/tools_deps.clj b/src/docker_clojure/dockerfile/tools_deps.clj index 285030f4..8d5a4fb5 100644 --- a/src/docker_clojure/dockerfile/tools_deps.clj +++ b/src/docker_clojure/dockerfile/tools_deps.clj @@ -1,5 +1,7 @@ (ns docker-clojure.dockerfile.tools-deps - (:require [docker-clojure.dockerfile.shared :refer :all])) + (:require [docker-clojure.dockerfile.shared + :refer [concat-commands copy-resource-file! entrypoint + install-distro-deps uninstall-distro-build-deps]])) (defn prereqs [dir _variant] (copy-resource-file! dir "rlwrap.retry" identity diff --git a/test/docker_clojure/core_test.clj b/test/docker_clojure/core_test.clj index 5d953e9f..605d6201 100644 --- a/test/docker_clojure/core_test.clj +++ b/test/docker_clojure/core_test.clj @@ -1,8 +1,8 @@ (ns docker-clojure.core-test - (:require [clojure.test :refer :all] - [docker-clojure.core :refer :all] + (:require [clojure.test :refer [deftest is are testing]] + [docker-clojure.core :refer [exclude? image-variants variant-map]] [docker-clojure.config :as cfg] - [docker-clojure.util :refer :all] + [docker-clojure.util :refer [default-docker-tag]] [clojure.string :as str])) (deftest image-variants-test diff --git a/test/docker_clojure/dockerfile_test.clj b/test/docker_clojure/dockerfile_test.clj index 31334f07..5c8264ca 100644 --- a/test/docker_clojure/dockerfile_test.clj +++ b/test/docker_clojure/dockerfile_test.clj @@ -1,7 +1,7 @@ (ns docker-clojure.dockerfile-test (:require [clojure.string :as str] - [clojure.test :refer :all] - [docker-clojure.dockerfile :refer :all] + [clojure.test :refer [deftest is testing]] + [docker-clojure.dockerfile :refer [build-dir contents]] [docker-clojure.config :as cfg] [docker-clojure.dockerfile.lein :as lein] [docker-clojure.dockerfile.boot :as boot] diff --git a/test/docker_clojure/manifest_test.clj b/test/docker_clojure/manifest_test.clj index 2dd032fd..30303036 100644 --- a/test/docker_clojure/manifest_test.clj +++ b/test/docker_clojure/manifest_test.clj @@ -1,6 +1,6 @@ (ns docker-clojure.manifest-test - (:require [clojure.test :refer :all] - [docker-clojure.manifest :refer :all])) + (:require [clojure.test :refer [deftest is are testing]] + [docker-clojure.manifest :refer [variant-tags]])) (deftest variant-tags-test (testing "Generates all-defaults tag for a build tool" diff --git a/test/docker_clojure/test_runner.clj b/test/docker_clojure/test_runner.clj index c43c512c..7b698930 100644 --- a/test/docker_clojure/test_runner.clj +++ b/test/docker_clojure/test_runner.clj @@ -1,5 +1,5 @@ (ns docker-clojure.test-runner - (:require [clojure.test :refer :all]) + (:require [clojure.test :refer [run-tests]]) (:gen-class)) (defn -main [& namespaces] @@ -9,4 +9,3 @@ {:keys [fail error]} test-results failures-and-errors (+ fail error)] (System/exit failures-and-errors))) -