Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/docker_clojure/docker.clj
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
(ns docker-clojure.docker
(:require [clojure.java.shell :refer [sh with-sh-dir]]
[clojure.spec.alpha :as s]
[clojure.string :as str]
[docker-clojure.config :as cfg]
[docker-clojure.core :as-alias core]
[docker-clojure.dockerfile :as df]
[docker-clojure.log :refer [log]]
[docker-clojure.util :refer [get-or-default]]
[docker-clojure.log :refer [log]]))
[docker-clojure.variant :as-alias variant]))

(defn pull-image [image]
(sh "docker" "pull" image))
Expand Down Expand Up @@ -109,7 +111,11 @@
(tag {:omit-distro? true} variant)
(tag {:omit-distro? true, :omit-build-tool-version? true} variant)
(tag {:omit-jdk? true, :omit-build-tool-version? true} variant)
(tag {:omit-jdk? true, :omit-distro? true
(tag {:omit-jdk? true, :omit-distro? true
:omit-build-tool-version? true} variant))
vec
sort)))

(s/fdef all-tags
:args (s/cat :variant ::variant/variant)
:ret (s/coll-of ::cfg/docker-tag))
2 changes: 1 addition & 1 deletion test/docker_clojure/manifest_test.clj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(ns docker-clojure.manifest-test
(:require [clojure.test :refer [deftest is are testing]]
(:require [clojure.test :refer [deftest is testing]]
[docker-clojure.manifest :refer [variant->manifest]]))

(deftest variant->manifest-test
Expand Down
Loading