Skip to content

Commit 0700d1d

Browse files
committed
Refactor to match upstream support tracks better
Instead of tracking individual minor releases, this tracks "stable", "rc", and "1.10" (hopefully someday renamed to "lts"). This matches https://julialang.org/downloads/manual-downloads/ and https://docs.julialang.org/en/v1/manual/faq/#Do-I-want-to-use-the-Stable,-LTS,-or-nightly-version-of-Julia? This then reflects that 1.11 is EOL (and has been since 1.12 went GA), and does so automatically (when 1.13 is GA, "stable" will auto-update to it, and "rc" will drop off until 1.14.0-alpha1+).
1 parent dc3cbe8 commit 0700d1d

File tree

28 files changed

+352
-679
lines changed

28 files changed

+352
-679
lines changed

1.10/bookworm/Dockerfile

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

1.10/trixie/Dockerfile

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

1.11/bookworm/Dockerfile

Lines changed: 0 additions & 87 deletions
This file was deleted.

1.11/trixie/Dockerfile

Lines changed: 0 additions & 87 deletions
This file was deleted.

1.11/windows/windowsservercore-ltsc2022/Dockerfile

Lines changed: 0 additions & 46 deletions
This file was deleted.

1.11/windows/windowsservercore-ltsc2025/Dockerfile

Lines changed: 0 additions & 46 deletions
This file was deleted.

1.13-rc/bookworm/docker-entrypoint.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

1.13-rc/trixie/docker-entrypoint.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

Dockerfile-linux.template

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{{
2+
include "shared"
3+
;
24
def is_alpine:
35
env.variant | startswith("alpine")
46
;
@@ -11,6 +13,7 @@
1113
arm64v8: "aarch64",
1214
i386: "x86",
1315
ppc64le: "ppc64le",
16+
riscv64: "riscv64",
1417
s390x: "s390x",
1518
}
1619
else
@@ -22,15 +25,14 @@
2225
i386: "i386",
2326
mips64le: "mips64el",
2427
ppc64le: "ppc64el",
28+
riscv64: "riscv64",
2529
s390x: "s390x",
2630
}
2731
end
2832
-}}
29-
{{ if is_alpine then ( -}}
30-
FROM alpine:{{ env.variant | ltrimstr("alpine") }}
31-
{{ ) else ( -}}
32-
FROM debian:{{ env.variant }}-slim
33+
FROM {{ from(env.variant) }}
3334

35+
{{ if is_alpine then "" else ( -}}
3436
RUN set -eux; \
3537
apt-get update; \
3638
apt-get install -y --no-install-recommends \
@@ -39,8 +41,8 @@ RUN set -eux; \
3941
curl \
4042
; \
4143
rm -rf /var/lib/apt/lists/*
42-
{{ ) end -}}
4344

45+
{{ ) end -}}
4446
ENV JULIA_PATH /usr/local/julia
4547
ENV PATH $JULIA_PATH/bin:$PATH
4648

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM mcr.microsoft.com/windows/{{ env.windowsVariant }}:{{ env.windowsRelease }}
1+
{{ include "shared" -}}
2+
FROM {{ from(env.variant) }}
23

34
# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
45
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

0 commit comments

Comments
 (0)