diff --git a/README.md b/README.md index 87debd4..839e91c 100644 --- a/README.md +++ b/README.md @@ -64,9 +64,6 @@ with an optional version (e.g. `pgsql:12`), defaults to `sqlite`. And `php-version` is one of `8.0`, `8.1`, `8.2`, `8.3`, `8.4` or `8.5`, defaults to the maximum version support by the current Nextcloud version. -Each php version also comes with a `-dbg` variant that has php compiled in debug -mode and can be used for debugging php itself with gdb. - You can specify a version number (e.g. `v32.0.2`) to use the sources from a release instead of using the local sources. diff --git a/src/php.rs b/src/php.rs index 2d037bc..b461c72 100644 --- a/src/php.rs +++ b/src/php.rs @@ -27,12 +27,6 @@ pub enum PhpVersion { Php82, Php81, Php80, - Php85Dbg, - Php84Dbg, - Php83Dbg, - Php82Dbg, - Php81Dbg, - Php80Dbg, } pub const PHP_MEMORY_LIMIT: i64 = 2 * 1024 * 1024 * 1024; @@ -48,14 +42,7 @@ impl FromStr for PhpVersion { "8.2" => Ok(PhpVersion::Php82), "8.3" => Ok(PhpVersion::Php83), "8.4" => Ok(PhpVersion::Php84), - "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), + "8.5" => Ok(PhpVersion::Php85), _ => Err(()), } } @@ -74,12 +61,6 @@ impl PhpVersion { PhpVersion::Php83 => "icewind1991/haze:8.3", PhpVersion::Php84 => "icewind1991/haze:8.4", 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", } } @@ -91,12 +72,6 @@ impl PhpVersion { PhpVersion::Php83 => "8.3", PhpVersion::Php84 => "8.4", 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", } } @@ -128,12 +103,6 @@ impl PhpVersion { PhpVersion::Php83, PhpVersion::Php84, PhpVersion::Php85, - PhpVersion::Php80Dbg, - PhpVersion::Php81Dbg, - PhpVersion::Php82Dbg, - PhpVersion::Php83Dbg, - PhpVersion::Php84Dbg, - PhpVersion::Php85Dbg, ] .into_iter() }