Skip to content

Commit

Permalink
Fix clj-kondo warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
cap10morgan committed Dec 5, 2023
1 parent 2e79055 commit 9ce8f06
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/docker_clojure/dockerfile.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion src/docker_clojure/dockerfile/boot.clj
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
4 changes: 3 additions & 1 deletion src/docker_clojure/dockerfile/lein.clj
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
4 changes: 3 additions & 1 deletion src/docker_clojure/dockerfile/tools_deps.clj
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions test/docker_clojure/core_test.clj
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/docker_clojure/dockerfile_test.clj
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
4 changes: 2 additions & 2 deletions test/docker_clojure/manifest_test.clj
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 1 addition & 2 deletions test/docker_clojure/test_runner.clj
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -9,4 +9,3 @@
{:keys [fail error]} test-results
failures-and-errors (+ fail error)]
(System/exit failures-and-errors)))

0 comments on commit 9ce8f06

Please sign in to comment.