From c6005eb58fdb4c72db96056563430338687491d1 Mon Sep 17 00:00:00 2001
From: Oleksandr Yakushev <alex@bytopia.org>
Date: Thu, 3 Oct 2024 20:45:23 +0300
Subject: [PATCH] Update Dockerfiles with no Noble JDK23

---
 .../lein/Dockerfile                           | 44 -------------------
 .../lein/entrypoint                           | 21 ---------
 .../tools-deps/Dockerfile                     | 27 ------------
 .../tools-deps/entrypoint                     | 21 ---------
 .../tools-deps/rlwrap.retry                   | 30 -------------
 5 files changed, 143 deletions(-)
 delete mode 100644 target/eclipse-temurin-23-jdk-jammy/lein/Dockerfile
 delete mode 100755 target/eclipse-temurin-23-jdk-jammy/lein/entrypoint
 delete mode 100644 target/eclipse-temurin-23-jdk-jammy/tools-deps/Dockerfile
 delete mode 100755 target/eclipse-temurin-23-jdk-jammy/tools-deps/entrypoint
 delete mode 100755 target/eclipse-temurin-23-jdk-jammy/tools-deps/rlwrap.retry

diff --git a/target/eclipse-temurin-23-jdk-jammy/lein/Dockerfile b/target/eclipse-temurin-23-jdk-jammy/lein/Dockerfile
deleted file mode 100644
index 09636d46..00000000
--- a/target/eclipse-temurin-23-jdk-jammy/lein/Dockerfile
+++ /dev/null
@@ -1,44 +0,0 @@
-FROM eclipse-temurin:23-jdk-jammy
-
-ENV LEIN_VERSION=2.11.2
-ENV LEIN_INSTALL=/usr/local/bin/
-
-WORKDIR /tmp
-
-# Download the whole repo as an archive
-RUN set -eux; \
-apt-get update && \
-apt-get install -y make git gnupg wget && \
-rm -rf /var/lib/apt/lists/* && \
-mkdir -p $LEIN_INSTALL && \
-wget -q https://codeberg.org/leiningen/leiningen/raw/tag/$LEIN_VERSION/bin/lein-pkg && \
-echo "Comparing lein-pkg checksum ..." && \
-sha256sum lein-pkg && \
-echo "28a1a62668c5f427b413a8677e376affaa995f023b1fcd06e2d4c98ac1df5f3e *lein-pkg" | sha256sum -c - && \
-mv lein-pkg $LEIN_INSTALL/lein && \
-chmod 0755 $LEIN_INSTALL/lein && \
-export GNUPGHOME="$(mktemp -d)" && \
-export FILENAME_EXT=jar && \
-gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 9D13D9426A0814B3373CF5E3D8A8243577A7859F && \
-wget -q https://codeberg.org/leiningen/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
-wget -q https://codeberg.org/leiningen/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
-echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
-gpgconf --kill all && \
-rm -rf "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
-mkdir -p /usr/share/java && \
-mkdir -p /root/.lein && \
-mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
-apt-get purge -y --auto-remove gnupg wget
-
-ENV PATH=$PATH:$LEIN_INSTALL
-ENV LEIN_ROOT 1
-
-# Install clojure 1.12.0 so users don't have to download it every time
-RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.0"]])' > project.clj \
-  && lein deps && rm project.clj
-
-COPY entrypoint /usr/local/bin/entrypoint
-
-ENTRYPOINT ["entrypoint"]
-CMD ["repl"]
diff --git a/target/eclipse-temurin-23-jdk-jammy/lein/entrypoint b/target/eclipse-temurin-23-jdk-jammy/lein/entrypoint
deleted file mode 100755
index ccf8cce5..00000000
--- a/target/eclipse-temurin-23-jdk-jammy/lein/entrypoint
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-set -eou pipefail
-
-entrypoint=lein
-
-cmd=${1:-}
-
-# check if the first arg starts with a hyphen
-if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
-  exec "${entrypoint}" "$@"
-fi
-
-if [[ -n "${cmd}" ]]; then
-  # see if help for the subcommand is successful
-  if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then
-    exec "${entrypoint}" "$@"
-  fi
-fi
-
-exec "$@"
diff --git a/target/eclipse-temurin-23-jdk-jammy/tools-deps/Dockerfile b/target/eclipse-temurin-23-jdk-jammy/tools-deps/Dockerfile
deleted file mode 100644
index 1fdd2248..00000000
--- a/target/eclipse-temurin-23-jdk-jammy/tools-deps/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM eclipse-temurin:23-jdk-jammy
-
-ENV CLOJURE_VERSION=1.12.0.1479
-
-WORKDIR /tmp
-
-RUN \
-apt-get update && \
-apt-get install -y curl make git rlwrap && \
-rm -rf /var/lib/apt/lists/* && \
-curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
-sha256sum linux-install-$CLOJURE_VERSION.sh && \
-echo "94f29b9b66183bd58307c46fb561fd9e9148666bac13a4518a9931b6f989d830 *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)"
-
-# Docker bug makes rlwrap crash w/o short sleep first
-# Bug: https://github.com/moby/moby/issues/28009
-# As of 2021-09-10 this bug still exists, despite that issue being closed
-COPY rlwrap.retry /usr/local/bin/rlwrap
-
-COPY entrypoint /usr/local/bin/entrypoint
-
-ENTRYPOINT ["entrypoint"]
-CMD ["-M", "--repl"]
diff --git a/target/eclipse-temurin-23-jdk-jammy/tools-deps/entrypoint b/target/eclipse-temurin-23-jdk-jammy/tools-deps/entrypoint
deleted file mode 100755
index 51561d1d..00000000
--- a/target/eclipse-temurin-23-jdk-jammy/tools-deps/entrypoint
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-set -eou pipefail
-
-entrypoint=clj
-
-cmd=${1:-}
-
-# check if the first arg starts with a hyphen
-if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
-  exec "${entrypoint}" "$@"
-fi
-
-if [[ -n "${cmd}" ]]; then
-  # see if help for the subcommand is successful
-  if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then
-    exec "${entrypoint}" "$@"
-  fi
-fi
-
-exec "$@"
diff --git a/target/eclipse-temurin-23-jdk-jammy/tools-deps/rlwrap.retry b/target/eclipse-temurin-23-jdk-jammy/tools-deps/rlwrap.retry
deleted file mode 100755
index 83cefbfb..00000000
--- a/target/eclipse-temurin-23-jdk-jammy/tools-deps/rlwrap.retry
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# This script works around a Docker bug that prevents rlwrap from starting
-# right when a container is first started. It is intended to replace
-# /usr/bin/rlwrap and also be named rlwrap but earlier in the PATH
-# (e.g. /usr/local/bin).
-
-max_tries=100 # 100 tries is ~1 second
-try=0
-
-while true; do
-  # see if rlwrap can start at all
-  output=$(/usr/bin/rlwrap true 2>&1 >/dev/null)
-  exit_code=$?
-  if [ $exit_code -gt 0 ]; then
-    # it didn't start
-    try=$((try+1))
-    if [ $try -gt $max_tries ]; then
-      # we're at max attempts so output the error and exit w/ the same code
-      echo "$output" >&2
-      exit $exit_code
-    else
-      # wait a bit and try again
-      sleep 0.01
-    fi
-  else
-    # rlwrap can start so let's run it for real
-    exec /usr/bin/rlwrap "$@"
-  fi
-done