From 83681e9e8b2694cd7cb2b3dcb156d08a39205ae4 Mon Sep 17 00:00:00 2001 From: Nikolay Gagarinov Date: Wed, 18 Nov 2026 20:58:11 +0500 Subject: [PATCH 1/2] =?UTF-8?q?fix(docker):=20=D0=B1=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20JDK=20=D0=B8=D0=B7=20eclipse-temurin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit В bookworm нет пакета openjdk-21-jdk, поэтому образ курса не собирался с 22.09.2026 и не публиковался. JDK копируется из eclipse-temurin:25-jdk, как в exercises-kotlin. Clojure CLI поднят до 1.12.6.1673, babashka до 1.13.229. Co-Authored-By: Claude Opus 5.5 --- Dockerfile | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 421b8f4..4f57f72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,22 @@ +FROM eclipse-temurin:25-jdk AS java + FROM hexletbasics/base-image:latest -ENV PATH="/exercises-clojure/bin:$PATH" +COPY --from=java /opt/java/openjdk /opt/java/openjdk +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH="/opt/java/openjdk/bin:/exercises-clojure/bin:$PATH" -RUN apt-get update && apt-get install -y --no-install-recommends \ - openjdk-21-jdk \ - rlwrap \ +RUN apt-get update && apt-get install -y --no-install-recommends rlwrap \ && rm -rf /var/lib/apt/lists/* -RUN curl -fsSL https://download.clojure.org/install/linux-install-1.12.0.1530.sh -o /tmp/clojure-install.sh && \ - chmod +x /tmp/clojure-install.sh && \ - /tmp/clojure-install.sh && \ - rm -f /tmp/clojure-install.sh && \ - curl -fsSL https://raw.githubusercontent.com/babashka/babashka/master/install -o /tmp/babashka-install && \ - chmod +x /tmp/babashka-install && \ - /tmp/babashka-install --version 1.3.185 && \ - rm -f /tmp/babashka-install +ARG CLOJURE_VERSION=1.12.6.1673 +ARG BABASHKA_VERSION=1.13.229 +RUN curl -fsSL "https://download.clojure.org/install/linux-install-${CLOJURE_VERSION}.sh" -o /tmp/clojure-install.sh \ + && bash /tmp/clojure-install.sh \ + && rm -f /tmp/clojure-install.sh \ + && curl -fsSL "https://raw.githubusercontent.com/babashka/babashka/v${BABASHKA_VERSION}/install" -o /tmp/babashka-install \ + && bash /tmp/babashka-install --version "${BABASHKA_VERSION}" \ + && rm -f /tmp/babashka-install WORKDIR /exercises-clojure From e4bf36b16f13893c1e279f9ce9412754f1dee257 Mon Sep 17 00:00:00 2001 From: Nikolay Gagarinov Date: Wed, 18 Nov 2026 20:58:11 +0500 Subject: [PATCH 2/2] =?UTF-8?q?fix(test):=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7?= =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B0=D1=80=D0=B3=D1=83=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D1=8B=20=D1=83=D0=BF=D0=B0=D0=B2=D1=88=D0=B5?= =?UTF-8?q?=D0=B3=D0=BE=20=D1=81=D0=BB=D1=83=D1=87=D0=B0=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit assert-solution печатал только (not (= true false)), и было непонятно, на каком входе решение ошиблось. Теперь в сообщении есть аргументы, а сравнение идёт в порядке (= expected actual). Closes #66 Co-Authored-By: Claude Opus 5.5 --- src/test-helper.clj | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test-helper.clj b/src/test-helper.clj index b1e4c2e..6d4d504 100644 --- a/src/test-helper.clj +++ b/src/test-helper.clj @@ -8,18 +8,19 @@ (defn ^:export assert-output [expected] (deftest output-test (let [out (s/trim (with-out-str (load-file "index.clj")))] - (is (= out expected)))) + (is (= expected out)))) (run-test)) (defn ^:export assert-solution [samples expected solution] (let [combined (map vector samples expected)] (deftest solution-test (doseq [[sample result] combined] - (is (= (apply solution sample) result))))) + (is (= result (apply solution sample)) + (str "Arguments: " (pr-str sample)))))) (run-test)) (defn ^:export check-eq [val expected] (deftest value-assert-test - (is (= val expected))) + (is (= expected val))) (run-test))