Skip to content
Merged
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
13 changes: 1 addition & 12 deletions src/docker_clojure/config.clj
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@
;; Generate in-range by construction; the default pos-int generator yields
;; values < 8 the >= 8 such-that can't satisfy at small sizes (flaky gen).
#(gen/choose 8 30)))
(s/def ::jdk-versions (s/coll-of ::jdk-version :distinct true :into #{}))

(s/def ::base-image ::non-blank-string)
(s/def ::base-images (s/coll-of ::base-image :distinct true :into #{}))

(def docker-image-name-re (re-pattern "[-\\w]+(?::[-\\w.]+)?"))

Expand Down Expand Up @@ -56,8 +54,6 @@
#(gen/fmap (fn [[namespace local]] (keyword namespace local))
(gen/vector (gen'/string-from-regex distro-component-re) 2))))

(s/def ::distros (s/coll-of ::distro :distinct true :into #{}))

(def specific-build-tools #{"lein" "tools-deps"})
(s/def ::specific-build-tool specific-build-tools)
(s/def ::build-tool (s/or ::specific-tool ::specific-build-tool
Expand All @@ -82,8 +78,6 @@
(gen/vector (s/gen ::specific-build-tool-version)
(count specific-build-tools)))))

(s/def ::maintainers
(s/coll-of ::non-blank-string :distinct true :into #{}))
(s/def ::maintainer ::non-blank-string)

(s/def ::architecture ::non-blank-string)
Expand All @@ -108,7 +102,6 @@
distro type. :default key is a fallback for base images not o/w specified."
{:default #{:alpine/alpine :ubuntu/jammy :ubuntu/noble}
"debian" #{:debian-slim/bookworm-slim :debian/bookworm
:debian-slim/bullseye-slim :debian/bullseye
:debian-slim/trixie-slim :debian/trixie}})

(def architectures
Expand Down Expand Up @@ -148,11 +141,7 @@
:distro :alpine/alpine}
;; Alpine w/ Java 8 stopped building correctly and not worth the time to fix
{:jdk-version 8
:distro :alpine/alpine}
;; ppc64le needs Debian Bookworm or newer
{:architecture "ppc64le"
:distro #(and (-> % namespace (str/starts-with? "debian"))
(-> % name (str/starts-with? "bullseye")))}})
:distro :alpine/alpine}})

(def maintainers
["Paul Lam <paul@quantisan.com> (@Quantisan)"
Expand Down
3 changes: 1 addition & 2 deletions src/docker_clojure/variant.clj
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@
(reduce
(fn [mav v]
(if-let [matching
(some #(when
(equal-except-architecture? v %)
(some #(when (equal-except-architecture? v %)
%)
mav)]
(-> mav
Expand Down
43 changes: 0 additions & 43 deletions target/debian-bullseye-11/lein/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions target/debian-bullseye-11/lein/entrypoint

This file was deleted.

29 changes: 0 additions & 29 deletions target/debian-bullseye-11/tools-deps/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions target/debian-bullseye-11/tools-deps/entrypoint

This file was deleted.

30 changes: 0 additions & 30 deletions target/debian-bullseye-11/tools-deps/rlwrap.retry

This file was deleted.

46 changes: 0 additions & 46 deletions target/debian-bullseye-17/lein/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions target/debian-bullseye-17/lein/entrypoint

This file was deleted.

32 changes: 0 additions & 32 deletions target/debian-bullseye-17/tools-deps/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions target/debian-bullseye-17/tools-deps/entrypoint

This file was deleted.

30 changes: 0 additions & 30 deletions target/debian-bullseye-17/tools-deps/rlwrap.retry

This file was deleted.

Loading
Loading