docker-library · yosifkit · Dec 6, 2025 · Dec 3, 2025
diff --git a/1.10/bookworm/Dockerfile b/1.10/bookworm/Dockerfile
diff --git a/1.10/trixie/Dockerfile b/1.10/trixie/Dockerfile
diff --git a/...ows/windowsservercore-ltsc2022/Dockerfile → 1.10/windows/servercore-ltsc2022/Dockerfile b/...ows/windowsservercore-ltsc2022/Dockerfile → 1.10/windows/servercore-ltsc2022/Dockerfile
diff --git a/...ows/windowsservercore-ltsc2025/Dockerfile → 1.10/windows/servercore-ltsc2025/Dockerfile b/...ows/windowsservercore-ltsc2025/Dockerfile → 1.10/windows/servercore-ltsc2025/Dockerfile
diff --git a/1.11/bookworm/Dockerfile b/1.11/bookworm/Dockerfile
diff --git a/1.11/trixie/Dockerfile b/1.11/trixie/Dockerfile
diff --git a/1.11/windows/windowsservercore-ltsc2022/Dockerfile b/1.11/windows/windowsservercore-ltsc2022/Dockerfile
diff --git a/1.11/windows/windowsservercore-ltsc2025/Dockerfile b/1.11/windows/windowsservercore-ltsc2025/Dockerfile
diff --git a/1.13-rc/bookworm/docker-entrypoint.sh b/1.13-rc/bookworm/docker-entrypoint.sh
diff --git a/1.13-rc/trixie/docker-entrypoint.sh b/1.13-rc/trixie/docker-entrypoint.sh
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
@@ -1,4 +1,6 @@
 {{
+	include "shared"
+	;
 	def is_alpine:
 		env.variant | startswith("alpine")
 	;
@@ -11,6 +13,7 @@
 				arm64v8: "aarch64",
 				i386: "x86",
 				ppc64le: "ppc64le",
+				riscv64: "riscv64",
 				s390x: "s390x",
 			}
 		else
@@ -22,15 +25,14 @@
 				i386: "i386",
 				mips64le: "mips64el",
 				ppc64le: "ppc64el",
+				riscv64: "riscv64",
 				s390x: "s390x",
 			}
 		end
 -}}
-{{ if is_alpine then ( -}}
-FROM alpine:{{ env.variant | ltrimstr("alpine") }}
-{{ ) else ( -}}
-FROM debian:{{ env.variant }}-slim
+FROM {{ from(env.variant) }}
 
+{{ if is_alpine then "" else ( -}}
 RUN set -eux; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
@@ -39,8 +41,8 @@ RUN set -eux; \
 		curl \
 	; \
 	rm -rf /var/lib/apt/lists/*
-{{ ) end -}}
 
+{{ ) end -}}
 ENV JULIA_PATH /usr/local/julia
 ENV PATH $JULIA_PATH/bin:$PATH
 

diff --git a/Dockerfile-windows-servercore.template → Dockerfile-windows.template b/Dockerfile-windows-servercore.template → Dockerfile-windows.template
@@ -1,4 +1,5 @@
-FROM mcr.microsoft.com/windows/{{ env.windowsVariant }}:{{ env.windowsRelease }}
+{{ include "shared" -}}
+FROM {{ from(env.variant) }}
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]