Skip to content

Commit cc9a992

Browse files
committed
Add fn spec for docker/all-tags
1 parent 35f70c8 commit cc9a992

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

src/docker_clojure/docker.clj

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
(ns docker-clojure.docker
22
(:require [clojure.java.shell :refer [sh with-sh-dir]]
3+
[clojure.spec.alpha :as s]
34
[clojure.string :as str]
45
[docker-clojure.config :as cfg]
56
[docker-clojure.core :as-alias core]
67
[docker-clojure.dockerfile :as df]
8+
[docker-clojure.log :refer [log]]
79
[docker-clojure.util :refer [get-or-default]]
8-
[docker-clojure.log :refer [log]]))
10+
[docker-clojure.variant :as-alias variant]))
911

1012
(defn pull-image [image]
1113
(sh "docker" "pull" image))
@@ -98,9 +100,9 @@
98100
(defn all-tags
99101
"Returns all Docker tags for the given variant"
100102
[variant]
101-
(let [short-tag (:docker-tag variant)
102-
full-tag (full-tag variant)
103-
base (into #{} [short-tag full-tag])]
103+
(let [short-tag (:docker-tag variant)
104+
full-tag (full-tag variant)
105+
base (into #{} [short-tag full-tag])]
104106
(-> base
105107
(conj
106108
(tag {:omit-jdk? true} variant)
@@ -109,7 +111,11 @@
109111
(tag {:omit-distro? true} variant)
110112
(tag {:omit-distro? true, :omit-build-tool-version? true} variant)
111113
(tag {:omit-jdk? true, :omit-build-tool-version? true} variant)
112-
(tag {:omit-jdk? true, :omit-distro? true
114+
(tag {:omit-jdk? true, :omit-distro? true
113115
:omit-build-tool-version? true} variant))
114116
vec
115117
sort)))
118+
119+
(s/fdef all-tags
120+
:args (s/cat :variant ::variant/variant)
121+
:ret (s/coll-of ::cfg/docker-tag))

test/docker_clojure/manifest_test.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns docker-clojure.manifest-test
2-
(:require [clojure.test :refer [deftest is are testing]]
2+
(:require [clojure.test :refer [deftest is testing]]
33
[docker-clojure.manifest :refer [variant->manifest]]))
44

55
(deftest variant->manifest-test

0 commit comments

Comments
 (0)