Skip to content

update docker distros #4251

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.

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
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/actions/docker-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ inputs:
default: 'amd64'
distro:
description: 'Linux Distro'
default: 'debian.11'
default: 'debian.12'
targetFramework:
description: '.net version'
default: '8.0'
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/_artifacts_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ jobs:
fail-fast: false
matrix:
distro:
- alpine.3.17
- alpine.3.18
- centos.stream.8
- debian.11
- fedora.37
- alpine.3.19
- alpine.3.20
- centos.stream.9
- debian.12
- fedora.40
- ubuntu.20.04
- ubuntu.22.04
- ubuntu.24.04
targetFramework: [ '6.0', '8.0' ]
targetFramework: [ '8.0', '6.0' ]

steps:
-
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ jobs:
fail-fast: false
matrix:
distro:
- alpine.3.17
- alpine.3.18
- centos.stream.8
- debian.11
- fedora.37
- alpine.3.19
- alpine.3.20
- centos.stream.9
- debian.12
- fedora.40
- ubuntu.20.04
- ubuntu.22.04
- ubuntu.24.04
targetFramework: [ '6.0', '8.0' ]
targetFramework: [ '8.0', '6.0' ]

steps:
-
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/_docker_manifests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
fail-fast: false
matrix:
distro:
- alpine.3.17
- alpine.3.18
- centos.stream.8
- debian.11
- fedora.37
- alpine.3.19
- alpine.3.20
- centos.stream.9
- debian.12
- fedora.40
- ubuntu.20.04
- ubuntu.22.04
- ubuntu.24.04
targetFramework: [ '6.0', '8.0' ]
targetFramework: [ '8.0', '6.0' ]

steps:
-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macos-13, macos-14]
targetFramework: [ '6.0', '8.0' ]
targetFramework: [ '8.0', '6.0' ]

runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion build/.run/Artifacts DotnetTool Test.run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Artifacts DotnetTool Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=alpine.3.17" />
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=alpine.3.19" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
<option name="PASS_PARENT_ENVS" value="1" />
<envs>
Expand Down
2 changes: 1 addition & 1 deletion build/.run/Artifacts MsBuildCore Test.run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Artifacts MsBuildCore Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=alpine.3.17" />
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=alpine.3.19" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
<option name="PASS_PARENT_ENVS" value="1" />
<envs>
Expand Down
2 changes: 1 addition & 1 deletion build/.run/Artifacts Native Test.run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Artifacts Native Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsNativeTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=alpine.3.17" />
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsNativeTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=alpine.3.19" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
<option name="PASS_PARENT_ENVS" value="1" />
<envs>
Expand Down
2 changes: 1 addition & 1 deletion build/.run/Artifacts Prepare.run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Artifacts Prepare" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsPrepare --docker_dotnetversion=8.0 --docker_distro=alpine.3.17" />
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsPrepare --docker_dotnetversion=8.0 --docker_distro=alpine.3.19" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
<option name="PASS_PARENT_ENVS" value="1" />
<envs>
Expand Down
2 changes: 1 addition & 1 deletion build/.run/Artifacts Test.run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Artifacts Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsTest --docker_dotnetversion=8.0 --docker_distro=alpine.3.17" />
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsTest --docker_dotnetversion=8.0 --docker_distro=alpine.3.19" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
<option name="PASS_PARENT_ENVS" value="1" />
<envs>
Expand Down
2 changes: 1 addition & 1 deletion build/.run/Docker Build.run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Docker Build" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --arch=amd64 --arch=arm64 --docker_dotnetversion=8.0 --docker_distro=debian.11 --verbosity=diagnostic" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --arch=amd64 --arch=arm64 --docker_dotnetversion=8.0 --docker_distro=debian.12 --verbosity=diagnostic" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
<option name="PASS_PARENT_ENVS" value="1" />
<envs>
Expand Down
2 changes: 1 addition & 1 deletion build/.run/Docker Manifest.run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Docker Manifest" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerManifest --arch=amd64 --arch=arm64 --docker_dotnetversion=8.0 --docker_distro=debian.11" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerManifest --arch=amd64 --arch=arm64 --docker_dotnetversion=8.0 --docker_distro=debian.12" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
<option name="PASS_PARENT_ENVS" value="1" />
<envs>
Expand Down
2 changes: 1 addition & 1 deletion build/.run/Docker Publish.run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Docker Publish" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerPublish --arch=amd64 --arch=arm64 --docker_dotnetversion=8.0 --docker_distro=debian.11 --verbosity=diagnostic" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerPublish --arch=amd64 --arch=arm64 --docker_dotnetversion=8.0 --docker_distro=debian.12 --verbosity=diagnostic" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
<option name="PASS_PARENT_ENVS" value="1" />
<envs>
Expand Down
2 changes: 1 addition & 1 deletion build/.run/Docker Test.run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Docker Test" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=debian.11" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=debian.12" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
<option name="PASS_PARENT_ENVS" value="1" />
<envs>
Expand Down
24 changes: 11 additions & 13 deletions build/common/Utilities/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,24 @@ public class Constants
public const string Arm64 = "arm64";
public const string Amd64 = "amd64";

public const string Alpine317 = "alpine.3.17";
public const string Alpine318 = "alpine.3.18";
public const string CentosStream8 = "centos.stream.8";
public const string Debian11 = "debian.11";
public const string Fedora37 = "fedora.37";
public const string AlpineMin = "alpine.3.19";
public const string AlpineLatest = "alpine.3.20";
public const string CentosStreamLatest = "centos.stream.9";
public const string DebianLatest = "debian.12";
public const string FedoraLatest = "fedora.40";
public const string Ubuntu2004 = "ubuntu.20.04";
public const string Ubuntu2204 = "ubuntu.22.04";
public const string Ubuntu2404 = "ubuntu.24.04";
public const string DockerDistroLatest = Debian11;
public const string DebianLatest = Debian11;
public const string DockerDistroLatest = DebianLatest;
public const string UbuntuLatest = Ubuntu2404;
public const string AlpineLatest = Alpine318;

public static readonly string[] DockerDistrosToBuild =
[
Alpine317,
Alpine318,
CentosStream8,
Debian11,
Fedora37,
AlpineMin,
AlpineLatest,
CentosStreamLatest,
DebianLatest,
FedoraLatest,
Ubuntu2004,
Ubuntu2204,
Ubuntu2404
Expand Down
2 changes: 1 addition & 1 deletion build/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG REGISTRY='docker.io'
ARG DISTRO='debian.11'
ARG DISTRO='debian.12'
ARG DOTNET_VERSION='8.0'
ARG VERSION='5.12.0'

Expand Down