From a3c6ae860d57bec01d81955c27ca68220fd3dbd3 Mon Sep 17 00:00:00 2001 From: JP White Date: Sat, 21 Jun 2025 16:06:47 -0400 Subject: [PATCH 1/2] Include tools --- Makefile | 18 ++++++++++-------- README.md | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index d5fb5a9..24d506b 100644 --- a/Makefile +++ b/Makefile @@ -25,14 +25,16 @@ build: docker_version=$$(docker exec $$container_id docker --version | awk '{print $$3}' | tr -d ',') && \ docker rm -f $$container_id > /dev/null 2>&1 && \ sed -i.bak \ - -e "s/| Node |.*|/| Node | $$node_version |/" \ - -e "s/| Python |.*|/| Python | $$python_version |/" \ - -e "s/| Java |.*|/| Java | $$java_version |/" \ - -e "s/| Dotnet |.*|/| Dotnet | $$dotnet_version |/" \ - -e "s/| GO |.*|/| GO | $$go_version |/" \ - -e "s/| Ruby |.*|/| Ruby | $$ruby_version |/" \ - -e "s/| Rust |.*|/| Rust | $$rust_version |/" \ - -e "s/| Docker |.*|/| Docker | $$docker_version |/" \ + -e "s/| Language Ecosystem | Version |.*/| Language Ecosystem | Version | Included Tools |/" \ + -e "s/| ------------------ | ------- |.*/| ------------------ | ------- | -------------------- |/" \ + -e "s/| Node |.*|.*/| Node | $$node_version | nvm, npm |/" \ + -e "s/| Python |.*|.*/| Python | $$python_version | poetry, pipenv, pipx |/" \ + -e "s/| Java |.*|.*/| Java | $$java_version | |/" \ + -e "s/| Dotnet |.*|.*/| Dotnet | $$dotnet_version | |/" \ + -e "s/| GO |.*|.*/| GO | $$go_version | |/" \ + -e "s/| Ruby |.*|.*/| Ruby | $$ruby_version | rbenv, gem |/" \ + -e "s/| Rust |.*|.*/| Rust | $$rust_version | |/" \ + -e "s/| Docker |.*|.*/| Docker | $$docker_version | |/" \ README.md && \ rm README.md.bak && \ echo "README.md updated with latest tool versions" diff --git a/README.md b/README.md index b53dc5f..af61742 100644 --- a/README.md +++ b/README.md @@ -18,16 +18,16 @@ This image is based on Ubuntu (latest LTS) ## Included Languages & Tools -| Language Ecosystem | Version | -| ------------------ | ------- | -| Node | 22.16.0 | -| Python | 3.12.3 | -| Java | 21.0.7 | -| Dotnet | 8.0.117 | -| GO | 1.24.4 | -| Ruby | 3.2.3 | -| Rust | 1.87.0 | -| Docker | 28.2.2 | +| Language Ecosystem | Version | Included Tools | +| ------------------ | ------- | -------------------- | +| Node | 22.16.0 | nvm, npm | +| Python | 3.12.3 | poetry, pipenv, pipx | +| Java | 21.0.7 | | +| Dotnet | 8.0.117 | | +| GO | 1.24.4 | | +| Ruby | 3.2.3 | rbenv, gem | +| Rust | 1.87.0 | | +| Docker | 28.2.2 | | # Build Instructions From 90d5a0a730abedcb24a263998aece1e630bf8d77 Mon Sep 17 00:00:00 2001 From: JP White Date: Sat, 31 Jan 2026 13:10:47 -0500 Subject: [PATCH 2/2] Update Dockerfile --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 51c9385..4bf19a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends python3 python3-dev python3-venv python3-pip && \ ln -s /usr/bin/python3 /usr/bin/python && \ # Java - apt-get install -y --no-install-recommends openjdk-21-jdk && \ + apt-get install -y --no-install-recommends openjdk-25-jdk && \ # .NET apt-get install -y --no-install-recommends dotnet-sdk-8.0 dotnet-runtime-8.0 && \ # Ruby @@ -61,9 +61,9 @@ RUN apt-get update && \ FROM languages AS tools # Install Go -RUN curl -OL https://go.dev/dl/go1.24.4.linux-amd64.tar.gz && \ - tar -C /usr/local -xf go1.24.4.linux-amd64.tar.gz && \ - rm go1.24.4.linux-amd64.tar.gz && \ +RUN curl -OL https://go.dev/dl/go1.25.6.linux-amd64.tar.gz && \ + tar -C /usr/local -xf go1.25.6.linux-amd64.tar.gz && \ + rm go1.25.6.linux-amd64.tar.gz && \ ln -sf /usr/local/go/bin/go /usr/bin/go # Install Node.js with nvm