robin/haze
1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-03 09:04:12 +02:00
Code Issues Projects Releases Wiki Activity

add 8.5 image

Browse source
This commit is contained in:
Robin Appelman 2026-03-09 23:00:21 +01:00
commit da6c6d754b
7 changed files with 37 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/php.rs
View file

@ -21,20 +21,18 @@ use tokio::time::{sleep, timeout};
#[allow(dead_code)]
pub enum PhpVersion {
#[default]
Php85,
Php84,
Php83,
Php82,
Php81,
Php80,
Php74,
Php73,
Php85Dbg,
Php84Dbg,
Php83Dbg,
Php82Dbg,
Php81Dbg,
Php80Dbg,
Php74Dbg,
Php73Dbg,
}
pub const PHP_MEMORY_LIMIT: i64 = 2 * 1024 * 1024 * 1024;
@ -44,24 +42,20 @@ impl FromStr for PhpVersion {
fn from_str(s: &str) -> Result<Self, Self::Err> {
match s {
"7" => Ok(PhpVersion::Php74),
"7.3" => Ok(PhpVersion::Php73),
"7.4" => Ok(PhpVersion::Php74),
"8" => Ok(PhpVersion::Php81),
"8.0" => Ok(PhpVersion::Php80),
"8.1" => Ok(PhpVersion::Php81),
"8.2" => Ok(PhpVersion::Php82),
"8.3" => Ok(PhpVersion::Php83),
"8.4" => Ok(PhpVersion::Php84),
"7-dbg" => Ok(PhpVersion::Php74Dbg),
"7.3-dbg" => Ok(PhpVersion::Php73Dbg),
"7.4-dbg" => Ok(PhpVersion::Php74Dbg),
"8.5" => Ok(PhpVersion::Php84),
"8-dbg" => Ok(PhpVersion::Php80Dbg),
"8.0-dbg" => Ok(PhpVersion::Php80Dbg),
"8.1-dbg" => Ok(PhpVersion::Php81Dbg),
"8.2-dbg" => Ok(PhpVersion::Php82Dbg),
"8.3-dbg" => Ok(PhpVersion::Php83Dbg),
"8.4-dbg" => Ok(PhpVersion::Php84Dbg),
"8.5-dbg" => Ok(PhpVersion::Php85Dbg),
_ => Err(()),
}
}
@ -73,53 +67,47 @@ impl PhpVersion {
}
pub fn image(&self) -> &'static str {
// for now only 7.4
match self {
PhpVersion::Php73 => "icewind1991/haze:7.3",
PhpVersion::Php74 => "icewind1991/haze:7.4",
PhpVersion::Php80 => "icewind1991/haze:8.0",
PhpVersion::Php81 => "icewind1991/haze:8.1",
PhpVersion::Php82 => "icewind1991/haze:8.2",
PhpVersion::Php83 => "icewind1991/haze:8.3",
PhpVersion::Php84 => "icewind1991/haze:8.4",
PhpVersion::Php73Dbg => "icewind1991/haze:7.3-dbg",
PhpVersion::Php74Dbg => "icewind1991/haze:7.4-dbg",
PhpVersion::Php85 => "icewind1991/haze:8.5",
PhpVersion::Php80Dbg => "icewind1991/haze:8.0-dbg",
PhpVersion::Php81Dbg => "icewind1991/haze:8.1-dbg",
PhpVersion::Php82Dbg => "icewind1991/haze:8.2-dbg",
PhpVersion::Php83Dbg => "icewind1991/haze:8.3-dbg",
PhpVersion::Php84Dbg => "icewind1991/haze:8.4-dbg",
PhpVersion::Php85Dbg => "icewind1991/haze:8.5-dbg",
}
}
pub fn name(&self) -> &'static str {
match self {
PhpVersion::Php73 => "7.3",
PhpVersion::Php74 => "7.4",
PhpVersion::Php80 => "8.0",
PhpVersion::Php81 => "8.1",
PhpVersion::Php82 => "8.2",
PhpVersion::Php83 => "8.3",
PhpVersion::Php84 => "8.4",
PhpVersion::Php73Dbg => "7.3-dbg",
PhpVersion::Php74Dbg => "7.4-dbg",
PhpVersion::Php85 => "8.4",
PhpVersion::Php80Dbg => "8.0-dbg",
PhpVersion::Php81Dbg => "8.1-dbg",
PhpVersion::Php82Dbg => "8.2-dbg",
PhpVersion::Php83Dbg => "8.3-dbg",
PhpVersion::Php84Dbg => "8.4-dbg",
PhpVersion::Php85Dbg => "8.4-dbg",
}
}
pub fn from_number(major: u8, minor: u8) -> Option<Self> {
match (major, minor) {
(7, 3) => Some(PhpVersion::Php73),
(7, 4) => Some(PhpVersion::Php74),
(8, 0) => Some(PhpVersion::Php80),
(8, 1) => Some(PhpVersion::Php81),
(8, 2) => Some(PhpVersion::Php82),
(8, 3) => Some(PhpVersion::Php83),
(8, 4) => Some(PhpVersion::Php84),
(8, 5) => Some(PhpVersion::Php85),
_ => None,
}
}
@ -127,27 +115,25 @@ impl PhpVersion {
pub fn max_minor(major: u8) -> u8 {
match major {
7 => 4,
8 => 4,
8 => 5,
_ => 0,
}
}
pub fn all() -> impl Iterator<Item = Self> {
[
PhpVersion::Php73,
PhpVersion::Php74,
PhpVersion::Php80,
PhpVersion::Php81,
PhpVersion::Php82,
PhpVersion::Php83,
PhpVersion::Php84,
PhpVersion::Php73Dbg,
PhpVersion::Php74Dbg,
PhpVersion::Php85,
PhpVersion::Php80Dbg,
PhpVersion::Php81Dbg,
PhpVersion::Php82Dbg,
PhpVersion::Php83Dbg,
PhpVersion::Php84Dbg,
PhpVersion::Php85Dbg,
]
.into_iter()
}