From d7827ad43c2740907e5814194b6af9ff3b8926fc Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Wed, 10 Apr 2024 10:33:54 -0600 Subject: [PATCH] Update tools-deps Dockerfiles to keep curl on ubuntu --- target/eclipse-temurin-11-jdk-focal/tools-deps/Dockerfile | 3 +-- target/eclipse-temurin-11-jdk-jammy/tools-deps/Dockerfile | 3 +-- target/eclipse-temurin-17-jdk-focal/tools-deps/Dockerfile | 3 +-- target/eclipse-temurin-17-jdk-jammy/tools-deps/Dockerfile | 3 +-- target/eclipse-temurin-21-jdk-jammy/tools-deps/Dockerfile | 3 +-- target/eclipse-temurin-22-jdk-jammy/tools-deps/Dockerfile | 3 +-- target/eclipse-temurin-8-jdk-focal/tools-deps/Dockerfile | 3 +-- target/eclipse-temurin-8-jdk-jammy/tools-deps/Dockerfile | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/target/eclipse-temurin-11-jdk-focal/tools-deps/Dockerfile b/target/eclipse-temurin-11-jdk-focal/tools-deps/Dockerfile index 750b0742..c28b85b3 100644 --- a/target/eclipse-temurin-11-jdk-focal/tools-deps/Dockerfile +++ b/target/eclipse-temurin-11-jdk-focal/tools-deps/Dockerfile @@ -14,8 +14,7 @@ echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-in 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 +clojure -e "(clojure-version)" # Docker bug makes rlwrap crash w/o short sleep first # Bug: https://github.com/moby/moby/issues/28009 diff --git a/target/eclipse-temurin-11-jdk-jammy/tools-deps/Dockerfile b/target/eclipse-temurin-11-jdk-jammy/tools-deps/Dockerfile index 45863415..365623d8 100644 --- a/target/eclipse-temurin-11-jdk-jammy/tools-deps/Dockerfile +++ b/target/eclipse-temurin-11-jdk-jammy/tools-deps/Dockerfile @@ -14,8 +14,7 @@ echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-in 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 +clojure -e "(clojure-version)" # Docker bug makes rlwrap crash w/o short sleep first # Bug: https://github.com/moby/moby/issues/28009 diff --git a/target/eclipse-temurin-17-jdk-focal/tools-deps/Dockerfile b/target/eclipse-temurin-17-jdk-focal/tools-deps/Dockerfile index 3aec94fe..895c6c20 100644 --- a/target/eclipse-temurin-17-jdk-focal/tools-deps/Dockerfile +++ b/target/eclipse-temurin-17-jdk-focal/tools-deps/Dockerfile @@ -14,8 +14,7 @@ echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-in 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 +clojure -e "(clojure-version)" # Docker bug makes rlwrap crash w/o short sleep first # Bug: https://github.com/moby/moby/issues/28009 diff --git a/target/eclipse-temurin-17-jdk-jammy/tools-deps/Dockerfile b/target/eclipse-temurin-17-jdk-jammy/tools-deps/Dockerfile index 6b039c66..c0397a35 100644 --- a/target/eclipse-temurin-17-jdk-jammy/tools-deps/Dockerfile +++ b/target/eclipse-temurin-17-jdk-jammy/tools-deps/Dockerfile @@ -14,8 +14,7 @@ echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-in 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 +clojure -e "(clojure-version)" # Docker bug makes rlwrap crash w/o short sleep first # Bug: https://github.com/moby/moby/issues/28009 diff --git a/target/eclipse-temurin-21-jdk-jammy/tools-deps/Dockerfile b/target/eclipse-temurin-21-jdk-jammy/tools-deps/Dockerfile index 13742667..2b3c9587 100644 --- a/target/eclipse-temurin-21-jdk-jammy/tools-deps/Dockerfile +++ b/target/eclipse-temurin-21-jdk-jammy/tools-deps/Dockerfile @@ -14,8 +14,7 @@ echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-in 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 +clojure -e "(clojure-version)" # Docker bug makes rlwrap crash w/o short sleep first # Bug: https://github.com/moby/moby/issues/28009 diff --git a/target/eclipse-temurin-22-jdk-jammy/tools-deps/Dockerfile b/target/eclipse-temurin-22-jdk-jammy/tools-deps/Dockerfile index 80153dc9..7636a469 100644 --- a/target/eclipse-temurin-22-jdk-jammy/tools-deps/Dockerfile +++ b/target/eclipse-temurin-22-jdk-jammy/tools-deps/Dockerfile @@ -14,8 +14,7 @@ echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-in 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 +clojure -e "(clojure-version)" # Docker bug makes rlwrap crash w/o short sleep first # Bug: https://github.com/moby/moby/issues/28009 diff --git a/target/eclipse-temurin-8-jdk-focal/tools-deps/Dockerfile b/target/eclipse-temurin-8-jdk-focal/tools-deps/Dockerfile index 843a2a60..c27d2bbf 100644 --- a/target/eclipse-temurin-8-jdk-focal/tools-deps/Dockerfile +++ b/target/eclipse-temurin-8-jdk-focal/tools-deps/Dockerfile @@ -14,8 +14,7 @@ echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-in 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 +clojure -e "(clojure-version)" # Docker bug makes rlwrap crash w/o short sleep first # Bug: https://github.com/moby/moby/issues/28009 diff --git a/target/eclipse-temurin-8-jdk-jammy/tools-deps/Dockerfile b/target/eclipse-temurin-8-jdk-jammy/tools-deps/Dockerfile index bcd27a90..f987dc8d 100644 --- a/target/eclipse-temurin-8-jdk-jammy/tools-deps/Dockerfile +++ b/target/eclipse-temurin-8-jdk-jammy/tools-deps/Dockerfile @@ -14,8 +14,7 @@ echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-in 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 +clojure -e "(clojure-version)" # Docker bug makes rlwrap crash w/o short sleep first # Bug: https://github.com/moby/moby/issues/28009