Skip to content

Commit f3015af

Browse files
committed
Install curl explicitly in tools-deps
…and use it instead of wget since the tools-deps installer script needs that anyway. An upstream mistake removed curl from some eclipse-temurin images, so this makes sure it’s installed either way.
1 parent 14ff6a3 commit f3015af

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/docker_clojure/dockerfile/tools_deps.clj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#(.setExecutable % true false)))
99

1010
(def distro-deps
11-
{:debian-slim {:build #{"wget" "curl"}
11+
{:debian-slim {:build #{"curl"}
1212
:runtime #{"rlwrap" "make" "git"}}
13-
:debian {:build #{"wget" "curl"}
13+
:debian {:build #{"curl"}
1414
:runtime #{"rlwrap" "make" "git"}}
15-
:ubuntu {:build #{"wget"}
15+
:ubuntu {:build #{"curl"}
1616
:runtime #{"rlwrap" "make" "git"}}
1717
:alpine {:build #{"curl"}
1818
:runtime #{"bash" "make" "git"}}})
@@ -36,7 +36,7 @@
3636
"RUN \\"]
3737
(concat-commands install-dep-cmds)
3838
(concat-commands
39-
["wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh"
39+
["curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh"
4040
"sha256sum linux-install-$CLOJURE_VERSION.sh"
4141
(str "echo \"" (get-in installer-hashes ["tools-deps" build-tool-version]) " *linux-install-$CLOJURE_VERSION.sh\" | sha256sum -c -")
4242
"chmod +x linux-install-$CLOJURE_VERSION.sh"

0 commit comments

Comments
 (0)