shrink the image by using the release package from github (#17)

* shrink the image by using the release package from github

* review suggestion

Author: glennj

.dockerignore

@@ -3,10 +3,12 @@
 .github/
 .gitattributes
 .gitignore
+.dockerignore
 Dockerfile
 bin/run-in-docker.sh
 bin/run-tests-in-docker.sh
 bin/run-tests.sh
 bin/benchmark.sh
 bin/benchmark-in-docker.sh
+bin/docker-build
 tests/

Dockerfile

@@ -1,25 +1,28 @@
-# dockerfile recipe from https://github.com/SnappyBeeBit/docker-odin/blob/main/Dockerfile.odin-dev-latest
-
 ARG ODIN_REF=dev-2025-10
+ARG ARCH=amd64
+ARG TARBALL="odin-linux-${ARCH}-dev-2025-10-05.tar.gz"
+ARG URL="https://github.com/odin-lang/Odin/releases/download/${ODIN_REF}/${TARBALL}"
 
 FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y --no-install-recommends \
-      git build-essential make ca-certificates \
-      clang-18 llvm-18-dev clang \
-      jq gawk locales\
-  && update-ca-certificates \
-  && locale-gen en_US.UTF-8 \
-  && rm -rf /var/lib/apt/lists/*
+RUN << END_APT
+    set -e
+    apt-get update -y
+    apt-get install -y --no-install-recommends ca-certificates clang jq gawk locales curl
+    update-ca-certificates
+    locale-gen en_US.UTF-8
+    rm -rf /var/lib/apt/lists/*
+END_APT
 
 WORKDIR /src
-ARG ODIN_REF
-RUN git clone --depth=1 --branch "${ODIN_REF}" https://github.com/odin-lang/Odin.git
-
-WORKDIR /src/Odin
-# Tell the build which llvm-config to use to avoid symlink hacks
-RUN make -j"$(nproc)" release-native LLVM_CONFIG=llvm-config-18
+ARG URL
+RUN << END_ODIN
+    set -e
+    curl --silent --location "${URL}" | tar zxf -
+    mv odin* Odin
+    ls -l Odin
+END_ODIN
 
 # Fix a bug in this Odin release.  When we upgrade, revisit this.
 RUN sed -E -i '983,984s/\<err\>/marshal_err/g' /src/Odin/core/testing/runner.odin
@@ -29,5 +32,5 @@ ENV ODIN_ROOT=/src/Odin
 ENV PATH="/src/Odin:${PATH}"
 
 WORKDIR /opt/test-runner
-COPY ./bin/ bin/
+COPY . .
 ENTRYPOINT ["/opt/test-runner/bin/run.sh"]

bin/docker-build

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# vim: set ft=bash
+
+image_name=${1:-exercism/odin-test-runner}
+
+arch="amd64"
+case $(uname -m) in
+    arm64 | aarch64) arch=arm64 ;;
+    x86_64) arch=amd64 ;;
+esac
+
+docker build --build-arg ARCH="${arch}" --rm --tag "${image_name}" .

bin/run-in-docker.sh

@@ -32,8 +32,10 @@ output_dir=$(realpath "${3%/}")
 # Create the output directory if it doesn't exist
 mkdir -p "${output_dir}"
 
+image="exercism/odin-test-runner"
+
 # Build the Docker image
-docker build --rm -t exercism/odin-test-runner .
+bin/docker-build "${image}"
 
 # Run the Docker image using the settings mimicking the production environment
 docker run \
@@ -43,4 +45,4 @@ docker run \
     --mount type=bind,src="${solution_dir}",dst=/solution \
     --mount type=bind,src="${output_dir}",dst=/output \
     --mount type=tmpfs,dst=/tmp \
-    exercism/odin-test-runner "${slug}" /solution /output 
+    "${image}" "${slug}" /solution /output 

bin/run-tests-in-docker.sh

@@ -15,8 +15,10 @@
 # Stop executing when a command returns a non-zero return code
 set -e
 
+image="exercism/odin-test-runner"
+
 # Build the Docker image
-docker build --rm -t exercism/odin-test-runner .
+bin/docker-build "${image}"
 
 # Run the Docker image using the settings mimicking the production environment
 docker run \
@@ -28,4 +30,4 @@ docker run \
     --volume "${PWD}/bin/run-tests.sh:/opt/test-runner/bin/run-tests.sh" \
     --workdir /opt/test-runner \
     --entrypoint /opt/test-runner/bin/run-tests.sh \
-    exercism/odin-test-runner
+    "$image"