Merge pull request #222 from Quantisan/fix/install-curl-explicitly

Fix: install curl explicitly in tools-deps images

Author: cap10morgan

src/docker_clojure/core.clj

@@ -231,7 +231,7 @@
     (filter variant-filter (valid-variants))))
 
 (defn run
-  "Entrypoint for exec-fn. TODO: Make -main use this."
+  "Entrypoint for exec-fn."
   [{:keys [cmd args parallelization]}]
   (logger/start)
   (let [variants (generate-variants args)]

src/docker_clojure/dockerfile/tools_deps.clj

@@ -8,12 +8,14 @@
                        #(.setExecutable % true false)))
 
 (def distro-deps
-  {:debian-slim {:build   #{"wget" "curl"}
+  {:debian-slim {:build   #{"curl"}
                  :runtime #{"rlwrap" "make" "git"}}
-   :debian      {:build   #{"wget" "curl"}
-                 :runtime #{"rlwrap" "make" "git"}}
-   :ubuntu      {:build   #{"wget"}
+   :debian      {:build   #{"curl"}
                  :runtime #{"rlwrap" "make" "git"}}
+   :ubuntu      {:build   #{}
+                 ;; install curl as a runtime dep b/c we need it at build time
+                 ;; but upstream includes it so we don't want to uninstall it
+                 :runtime #{"rlwrap" "make" "git" "curl"}}
    :alpine      {:build   #{"curl"}
                  :runtime #{"bash" "make" "git"}}})
 
@@ -36,7 +38,7 @@
          "RUN \\"]
         (concat-commands install-dep-cmds)
         (concat-commands
-          ["wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh"
+          ["curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh"
            "sha256sum linux-install-$CLOJURE_VERSION.sh"
            (str "echo \"" (get-in installer-hashes ["tools-deps" build-tool-version]) " *linux-install-$CLOJURE_VERSION.sh\" | sha256sum -c -")
            "chmod +x linux-install-$CLOJURE_VERSION.sh"

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

@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 rm linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009

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

@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 rm linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009

target/debian-bookworm-21/latest/Dockerfile

@@ -50,16 +50,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 rm linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009

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

@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 rm linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009

target/debian-bookworm-22/tools-deps/Dockerfile

@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 rm linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009

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

@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 rm linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009

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

@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 rm linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009

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

@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 rm linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009