Skip to content

Commit d2d2ae6

Browse files
cap10morgancap10morgan
authored
Merge pull request #259 from Quantisan/update/tools-deps
Update tools-deps variants to 1.12.1.1561
2 parents fd0e895 + 316ffd1 commit d2d2ae6

File tree

46 files changed

+111
-111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+111
-111
lines changed

‎src/docker_clojure/config.clj‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,32 @@
1919

2020
(s/def ::docker-image-name
2121
(s/with-gen
22-
(s/and ::non-blank-string
23-
#(re-matches docker-image-name-re %))
24-
#(gen'/string-from-regex docker-image-name-re)))
22+
(s/and ::non-blank-string
23+
#(re-matches docker-image-name-re %))
24+
#(gen'/string-from-regex docker-image-name-re)))
2525

2626
(def docker-tag-re (re-pattern "[-\\w.]+"))
2727

2828
(s/def ::docker-tag
2929
(s/with-gen
30-
(s/and ::non-blank-string
31-
#(re-matches docker-tag-re %))
32-
#(gen'/string-from-regex docker-tag-re)))
30+
(s/and ::non-blank-string
31+
#(re-matches docker-tag-re %))
32+
#(gen'/string-from-regex docker-tag-re)))
3333

3434
(s/def ::base-image-tag ::docker-image-name)
3535

3636
(def distro-component-re (re-pattern "[-_A-Za-z][-\\w.]+"))
3737

3838
(s/def ::distro
3939
(s/with-gen
40-
(s/and qualified-keyword?
41-
#(->> %
42-
((juxt namespace name))
43-
((fn [elements]
44-
(every? (fn [e] (re-matches distro-component-re e))
45-
elements)))))
46-
#(gen/fmap (fn [[namespace local]] (keyword namespace local))
47-
(gen/vector (gen'/string-from-regex distro-component-re) 2))))
40+
(s/and qualified-keyword?
41+
#(->> %
42+
((juxt namespace name))
43+
((fn [elements]
44+
(every? (fn [e] (re-matches distro-component-re e))
45+
elements)))))
46+
#(gen/fmap (fn [[namespace local]] (keyword namespace local))
47+
(gen/vector (gen'/string-from-regex distro-component-re) 2))))
4848

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

@@ -53,10 +53,10 @@
5353
::all-tools #{::core/all}))
5454
(s/def ::specific-build-tool-version
5555
(s/with-gen
56-
(s/and ::non-blank-string
57-
#(re-matches #"(?:\d+\.)+\d+" %))
58-
#(gen/fmap (fn [nums] (str/join "." nums))
59-
(gen/vector (gen/int) 2 4))))
56+
(s/and ::non-blank-string
57+
#(re-matches #"(?:\d+\.)+\d+" %))
58+
#(gen/fmap (fn [nums] (str/join "." nums))
59+
(gen/vector (gen/int) 2 4))))
6060

6161
(s/def ::build-tool-version
6262
(s/nilable ::specific-build-tool-version))
@@ -106,15 +106,15 @@
106106

107107
(def build-tools
108108
{"lein" "2.11.2"
109-
"tools-deps" "1.12.1.1550"})
109+
"tools-deps" "1.12.1.1561"})
110110

111111
(def default-build-tool "tools-deps")
112112

113113
(def installer-hashes
114114
{"lein" {"2.11.1" "03b3fbf7e6fac262f88f843a87b712a2b37f39cffc4f4f384436a30d8b01d6e4"
115115
"2.11.2" "28a1a62668c5f427b413a8677e376affaa995f023b1fcd06e2d4c98ac1df5f3e"}
116-
"tools-deps" {"1.12.1.1543" "09b7b8185b8a35b1ddcc9c2a5155d094fe1237805c24489312f3e324a83b0d4c"
117-
"1.12.1.1550" "aea202cd0573d79fd8b7db1b608762645a8f93006a86bc817ec130bed1d9707d"}})
116+
"tools-deps" {"1.12.1.1550" "aea202cd0573d79fd8b7db1b608762645a8f93006a86bc817ec130bed1d9707d"
117+
"1.12.1.1561" "b0328626c508af54c3eaf00cfb67e85d5215c6447b15c8ecc70fbe29ca95d64e"}})
118118

119119
(def exclusions ; don't build these for whatever reason(s)
120120
#{;; No more jammy builds for JDK 23+

‎target/debian-bookworm-11/tools-deps/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk
44
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
55
ENV PATH="${JAVA_HOME}/bin:${PATH}"
66

7-
ENV CLOJURE_VERSION=1.12.1.1550
7+
ENV CLOJURE_VERSION=1.12.1.1561
88

99
WORKDIR /tmp
1010

@@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \
1414
rm -rf /var/lib/apt/lists/* && \
1515
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
1616
sha256sum linux-install-$CLOJURE_VERSION.sh && \
17-
echo "aea202cd0573d79fd8b7db1b608762645a8f93006a86bc817ec130bed1d9707d *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
17+
echo "b0328626c508af54c3eaf00cfb67e85d5215c6447b15c8ecc70fbe29ca95d64e *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
1818
chmod +x linux-install-$CLOJURE_VERSION.sh && \
1919
./linux-install-$CLOJURE_VERSION.sh && \
2020
rm linux-install-$CLOJURE_VERSION.sh && \

‎target/debian-bookworm-17/tools-deps/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk
44
COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME
55
ENV PATH="${JAVA_HOME}/bin:${PATH}"
66

7-
ENV CLOJURE_VERSION=1.12.1.1550
7+
ENV CLOJURE_VERSION=1.12.1.1561
88

99
WORKDIR /tmp
1010

@@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \
1414
rm -rf /var/lib/apt/lists/* && \
1515
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
1616
sha256sum linux-install-$CLOJURE_VERSION.sh && \
17-
echo "aea202cd0573d79fd8b7db1b608762645a8f93006a86bc817ec130bed1d9707d *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
17+
echo "b0328626c508af54c3eaf00cfb67e85d5215c6447b15c8ecc70fbe29ca95d64e *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
1818
chmod +x linux-install-$CLOJURE_VERSION.sh && \
1919
./linux-install-$CLOJURE_VERSION.sh && \
2020
rm linux-install-$CLOJURE_VERSION.sh && \

‎target/debian-bookworm-21/latest/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.0"]])'
4545
&& lein deps && rm project.clj
4646

4747
### INSTALL TOOLS-DEPS ###
48-
ENV CLOJURE_VERSION=1.12.1.1550
48+
ENV CLOJURE_VERSION=1.12.1.1561
4949

5050
WORKDIR /tmp
5151

@@ -55,7 +55,7 @@ apt-get install -y curl make git rlwrap && \
5555
rm -rf /var/lib/apt/lists/* && \
5656
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
5757
sha256sum linux-install-$CLOJURE_VERSION.sh && \
58-
echo "aea202cd0573d79fd8b7db1b608762645a8f93006a86bc817ec130bed1d9707d *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
58+
echo "b0328626c508af54c3eaf00cfb67e85d5215c6447b15c8ecc70fbe29ca95d64e *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
5959
chmod +x linux-install-$CLOJURE_VERSION.sh && \
6060
./linux-install-$CLOJURE_VERSION.sh && \
6161
rm linux-install-$CLOJURE_VERSION.sh && \

‎target/debian-bookworm-21/tools-deps/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk
44
COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME
55
ENV PATH="${JAVA_HOME}/bin:${PATH}"
66

7-
ENV CLOJURE_VERSION=1.12.1.1550
7+
ENV CLOJURE_VERSION=1.12.1.1561
88

99
WORKDIR /tmp
1010

@@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \
1414
rm -rf /var/lib/apt/lists/* && \
1515
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
1616
sha256sum linux-install-$CLOJURE_VERSION.sh && \
17-
echo "aea202cd0573d79fd8b7db1b608762645a8f93006a86bc817ec130bed1d9707d *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
17+
echo "b0328626c508af54c3eaf00cfb67e85d5215c6447b15c8ecc70fbe29ca95d64e *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
1818
chmod +x linux-install-$CLOJURE_VERSION.sh && \
1919
./linux-install-$CLOJURE_VERSION.sh && \
2020
rm linux-install-$CLOJURE_VERSION.sh && \

‎target/debian-bookworm-24/tools-deps/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk
44
COPY --from=eclipse-temurin:24 $JAVA_HOME $JAVA_HOME
55
ENV PATH="${JAVA_HOME}/bin:${PATH}"
66

7-
ENV CLOJURE_VERSION=1.12.1.1550
7+
ENV CLOJURE_VERSION=1.12.1.1561
88

99
WORKDIR /tmp
1010

@@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \
1414
rm -rf /var/lib/apt/lists/* && \
1515
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
1616
sha256sum linux-install-$CLOJURE_VERSION.sh && \
17-
echo "aea202cd0573d79fd8b7db1b608762645a8f93006a86bc817ec130bed1d9707d *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
17+
echo "b0328626c508af54c3eaf00cfb67e85d5215c6447b15c8ecc70fbe29ca95d64e *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
1818
chmod +x linux-install-$CLOJURE_VERSION.sh && \
1919
./linux-install-$CLOJURE_VERSION.sh && \
2020
rm linux-install-$CLOJURE_VERSION.sh && \

‎target/debian-bookworm-8/tools-deps/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk
44
COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME
55
ENV PATH="${JAVA_HOME}/bin:${PATH}"
66

7-
ENV CLOJURE_VERSION=1.12.1.1550
7+
ENV CLOJURE_VERSION=1.12.1.1561
88

99
WORKDIR /tmp
1010

@@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \
1414
rm -rf /var/lib/apt/lists/* && \
1515
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
1616
sha256sum linux-install-$CLOJURE_VERSION.sh && \
17-
echo "aea202cd0573d79fd8b7db1b608762645a8f93006a86bc817ec130bed1d9707d *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
17+
echo "b0328626c508af54c3eaf00cfb67e85d5215c6447b15c8ecc70fbe29ca95d64e *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
1818
chmod +x linux-install-$CLOJURE_VERSION.sh && \
1919
./linux-install-$CLOJURE_VERSION.sh && \
2020
rm linux-install-$CLOJURE_VERSION.sh && \

‎target/debian-bookworm-slim-11/tools-deps/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk
44
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
55
ENV PATH="${JAVA_HOME}/bin:${PATH}"
66

7-
ENV CLOJURE_VERSION=1.12.1.1550
7+
ENV CLOJURE_VERSION=1.12.1.1561
88

99
WORKDIR /tmp
1010

@@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \
1414
rm -rf /var/lib/apt/lists/* && \
1515
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
1616
sha256sum linux-install-$CLOJURE_VERSION.sh && \
17-
echo "aea202cd0573d79fd8b7db1b608762645a8f93006a86bc817ec130bed1d9707d *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
17+
echo "b0328626c508af54c3eaf00cfb67e85d5215c6447b15c8ecc70fbe29ca95d64e *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
1818
chmod +x linux-install-$CLOJURE_VERSION.sh && \
1919
./linux-install-$CLOJURE_VERSION.sh && \
2020
rm linux-install-$CLOJURE_VERSION.sh && \

‎target/debian-bookworm-slim-17/tools-deps/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk
44
COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME
55
ENV PATH="${JAVA_HOME}/bin:${PATH}"
66

7-
ENV CLOJURE_VERSION=1.12.1.1550
7+
ENV CLOJURE_VERSION=1.12.1.1561
88

99
WORKDIR /tmp
1010

@@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \
1414
rm -rf /var/lib/apt/lists/* && \
1515
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
1616
sha256sum linux-install-$CLOJURE_VERSION.sh && \
17-
echo "aea202cd0573d79fd8b7db1b608762645a8f93006a86bc817ec130bed1d9707d *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
17+
echo "b0328626c508af54c3eaf00cfb67e85d5215c6447b15c8ecc70fbe29ca95d64e *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
1818
chmod +x linux-install-$CLOJURE_VERSION.sh && \
1919
./linux-install-$CLOJURE_VERSION.sh && \
2020
rm linux-install-$CLOJURE_VERSION.sh && \

‎target/debian-bookworm-slim-21/tools-deps/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk
44
COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME
55
ENV PATH="${JAVA_HOME}/bin:${PATH}"
66

7-
ENV CLOJURE_VERSION=1.12.1.1550
7+
ENV CLOJURE_VERSION=1.12.1.1561
88

99
WORKDIR /tmp
1010

@@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \
1414
rm -rf /var/lib/apt/lists/* && \
1515
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
1616
sha256sum linux-install-$CLOJURE_VERSION.sh && \
17-
echo "aea202cd0573d79fd8b7db1b608762645a8f93006a86bc817ec130bed1d9707d *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
17+
echo "b0328626c508af54c3eaf00cfb67e85d5215c6447b15c8ecc70fbe29ca95d64e *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
1818
chmod +x linux-install-$CLOJURE_VERSION.sh && \
1919
./linux-install-$CLOJURE_VERSION.sh && \
2020
rm linux-install-$CLOJURE_VERSION.sh && \

0 commit comments

Comments
 (0)