Skip to content

Add Alpine 3.15 #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 3, 2021
Merged

Add Alpine 3.15 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
unreleased
----------

- Add Alpine 3.15 (3.14 is now tier 2 and 3.13 is deprecated) (@talex5)
- Switch all GitHub access from git:// to https:// in advance of insecure protocol
sunset (@kit-ty-kate #73)
- Fix dependencies of dockerfile-cmd: result now correctly used (@dra27 #72)
Expand Down
19 changes: 12 additions & 7 deletions src-opam/dockerfile_distro.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ let win10_kb_number_to_lcu (v:win10_release) kb =
| exception Not_found -> None

type t = [
| `Alpine of [ `V3_3 | `V3_4 | `V3_5 | `V3_6 | `V3_7 | `V3_8 | `V3_9 | `V3_10 | `V3_11 | `V3_12 | `V3_13 | `V3_14 | `Latest ]
| `Alpine of [ `V3_3 | `V3_4 | `V3_5 | `V3_6 | `V3_7 | `V3_8 | `V3_9 | `V3_10 | `V3_11 | `V3_12 | `V3_13 | `V3_14 | `V3_15 | `Latest ]
| `Archlinux of [ `Latest ]
| `CentOS of [ `V6 | `V7 | `V8 | `Latest ]
| `Debian of [ `V11 | `V10 | `V9 | `V8 | `V7 | `Stable | `Testing | `Unstable ]
Expand Down Expand Up @@ -143,7 +143,7 @@ type status = [
] [@@deriving sexp]

let distros : t list = [
`Alpine `V3_3; `Alpine `V3_4; `Alpine `V3_5; `Alpine `V3_6; `Alpine `V3_7; `Alpine `V3_8; `Alpine `V3_9; `Alpine `V3_10; `Alpine `V3_11; `Alpine `V3_12; `Alpine `V3_13; `Alpine `V3_14; `Alpine `Latest;
`Alpine `V3_3; `Alpine `V3_4; `Alpine `V3_5; `Alpine `V3_6; `Alpine `V3_7; `Alpine `V3_8; `Alpine `V3_9; `Alpine `V3_10; `Alpine `V3_11; `Alpine `V3_12; `Alpine `V3_13; `Alpine `V3_14; `Alpine `V3_15; `Alpine `Latest;
`Archlinux `Latest;
`CentOS `V6; `CentOS `V7; `CentOS `V8; `CentOS `Latest;
`Debian `V11; `Debian `V10; `Debian `V9; `Debian `V8; `Debian `V7;
Expand Down Expand Up @@ -204,10 +204,10 @@ let win10_docker_status (base : win10_docker_base_image) v : status =
let win10_latest_image = `Ltsc2022

let distro_status (d:t) : status = match d with
| `Alpine (`V3_3 | `V3_4 | `V3_5 | `V3_6 | `V3_7 | `V3_8 | `V3_9 | `V3_10 | `V3_11 | `V3_12) -> `Deprecated
| `Alpine `V3_13 -> `Active `Tier2
| `Alpine `V3_14 -> `Active `Tier1
| `Alpine `Latest -> `Alias (`Alpine `V3_14)
| `Alpine (`V3_3 | `V3_4 | `V3_5 | `V3_6 | `V3_7 | `V3_8 | `V3_9 | `V3_10 | `V3_11 | `V3_12 |`V3_13) -> `Deprecated
| `Alpine `V3_14 -> `Active `Tier2
| `Alpine `V3_15 -> `Active `Tier1
| `Alpine `Latest -> `Alias (`Alpine `V3_15)
| `Archlinux `Latest -> `Active `Tier3
| `CentOS `V8 -> `Active `Tier2
| `CentOS `V7 -> `Active `Tier3
Expand Down Expand Up @@ -267,7 +267,7 @@ let distro_arches ov (d:t) =
| `Debian `V11, ov when OV.(compare Releases.v4_05_0 ov) = -1 -> [ `I386; `X86_64; `Aarch64; `Ppc64le; `Aarch32; `S390x ]
| `Debian `V10, ov when OV.(compare Releases.v4_05_0 ov) = -1 -> [ `I386; `X86_64; `Aarch64; `Ppc64le; `Aarch32; `S390x ]
| `Debian `V9, ov when OV.(compare Releases.v4_05_0 ov) = -1 -> [ `I386; `X86_64; `Aarch64; `Aarch32 ]
| `Alpine (`V3_6 | `V3_7 | `V3_8 | `V3_9 | `V3_10 | `V3_11 | `V3_12 | `V3_13 |`V3_14), ov when OV.(compare Releases.v4_05_0 ov) = -1 -> [ `X86_64; `Aarch64 ]
| `Alpine (`V3_6 | `V3_7 | `V3_8 | `V3_9 | `V3_10 | `V3_11 | `V3_12 | `V3_13 | `V3_14 | `V3_15), ov when OV.(compare Releases.v4_05_0 ov) = -1 -> [ `X86_64; `Aarch64 ]
| `Ubuntu (`V18_04|`V20_04|`V20_10|`V21_04 |`V21_10), ov when OV.(compare Releases.v4_05_0 ov) = -1 -> [ `X86_64; `Aarch64; `Ppc64le ]
| `Fedora (`V33|`V34), ov when OV.(compare Releases.v4_08_0 ov) = -1 -> [ `X86_64; `Aarch64 ]
(* 2021-04-19: should be 4.03 but there's a linking failure until 4.06. *)
Expand Down Expand Up @@ -335,6 +335,7 @@ let builtin_ocaml_of_distro (d:t) : string option =
|`Alpine `V3_12 -> Some "4.08.1"
|`Alpine `V3_13 -> Some "4.08.1"
|`Alpine `V3_14 -> Some "4.12.0"
|`Alpine `V3_15 -> Some "4.13.1"
|`Archlinux `Latest -> Some "4.11.1"
|`Fedora `V21 -> Some "4.01.0"
|`Fedora `V22 -> Some "4.02.0"
Expand Down Expand Up @@ -475,6 +476,7 @@ let tag_of_distro (d:t) = match d with
|`Alpine `V3_12 -> "alpine-3.12"
|`Alpine `V3_13 -> "alpine-3.13"
|`Alpine `V3_14 -> "alpine-3.14"
|`Alpine `V3_15 -> "alpine-3.15"
|`Alpine `Latest -> "alpine"
|`Archlinux `Latest -> "archlinux"
|`OpenSUSE `V42_1 -> "opensuse-42.1"
Expand Down Expand Up @@ -556,6 +558,7 @@ let distro_of_tag x : t option =
|"alpine-3.12" -> Some (`Alpine `V3_12)
|"alpine-3.13" -> Some (`Alpine `V3_13)
|"alpine-3.14" -> Some (`Alpine `V3_14)
|"alpine-3.15" -> Some (`Alpine `V3_15)
|"alpine" -> Some (`Alpine `Latest)
|"archlinux" -> Some (`Archlinux `Latest)
|"opensuse-42.1" -> Some (`OpenSUSE `V42_1)
Expand Down Expand Up @@ -632,6 +635,7 @@ let rec human_readable_string_of_distro (d:t) =
|`Alpine `V3_12 -> "Alpine 3.12"
|`Alpine `V3_13 -> "Alpine 3.13"
|`Alpine `V3_14 -> "Alpine 3.14"
|`Alpine `V3_15 -> "Alpine 3.15"
|`Archlinux `Latest -> "Archlinux"
|`OpenSUSE `V42_1 -> "OpenSUSE 42.1"
|`OpenSUSE `V42_2 -> "OpenSUSE 42.2"
Expand Down Expand Up @@ -714,6 +718,7 @@ let base_distro_tag ?win10_revision ?(arch=`X86_64) d =
| `V3_12 -> "3.12"
| `V3_13 -> "3.13"
| `V3_14 -> "3.14"
| `V3_15 -> "3.15"
| `Latest -> assert false
in
match arch with
Expand Down
2 changes: 1 addition & 1 deletion src-opam/dockerfile_distro.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ type win10_revision = win10_release * win10_lcu option [@@deriving sexp]
(** A Windows 10 version optionally with an LCU. *)

type t = [
| `Alpine of [ `V3_3 | `V3_4 | `V3_5 | `V3_6 | `V3_7 | `V3_8 | `V3_9 | `V3_10 | `V3_11 | `V3_12 | `V3_13 | `V3_14 | `Latest ]
| `Alpine of [ `V3_3 | `V3_4 | `V3_5 | `V3_6 | `V3_7 | `V3_8 | `V3_9 | `V3_10 | `V3_11 | `V3_12 | `V3_13 | `V3_14 | `V3_15 | `Latest ]
| `Archlinux of [ `Latest ]
| `CentOS of [ `V6 | `V7 | `V8 | `Latest ]
| `Debian of [ `V11 | `V10 | `V9 | `V8 | `V7 | `Stable | `Testing | `Unstable ]
Expand Down