Skip to content

Commit a6ffa91

Browse files
authored
Merge pull request #4625 from arturcic/feature/docker-images
updates Alpine to 3.21 and Fedora to 41 in Docker image constants and…
2 parents 254eac2 + a1796c7 commit a6ffa91

File tree

6 files changed

+12
-14
lines changed

6 files changed

+12
-14
lines changed

build/.run/Artifacts DotnetTool Test.run.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Artifacts DotnetTool Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.20" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.21" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>
@@ -20,4 +20,4 @@
2020
<option name="Build" />
2121
</method>
2222
</configuration>
23-
</component>
23+
</component>

build/.run/Artifacts MsBuildCore Test.run.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Artifacts MsBuildCore Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.20" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.21" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>
@@ -20,4 +20,4 @@
2020
<option name="Build" />
2121
</method>
2222
</configuration>
23-
</component>
23+
</component>

build/.run/Artifacts Native Test.run.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Artifacts Native Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsNativeTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.20" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsNativeTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.21" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>
@@ -20,4 +20,4 @@
2020
<option name="Build" />
2121
</method>
2222
</configuration>
23-
</component>
23+
</component>

build/.run/Artifacts Prepare.run.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Artifacts Prepare" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsPrepare --dotnet_version=8.0 --docker_distro=alpine.3.20" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsPrepare --dotnet_version=8.0 --docker_distro=alpine.3.21" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>
@@ -20,4 +20,4 @@
2020
<option name="Build" />
2121
</method>
2222
</configuration>
23-
</component>
23+
</component>

build/.run/Artifacts Test.run.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Artifacts Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsTest --dotnet_version=8.0 --docker_distro=alpine.3.20" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsTest --dotnet_version=8.0 --docker_distro=alpine.3.21" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>
@@ -20,4 +20,4 @@
2020
<option name="Build" />
2121
</method>
2222
</configuration>
23-
</component>
23+
</component>

build/common/Utilities/Constants.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@ public static class Constants
2424
public const string GitHubContainerRegistry = "ghcr.io";
2525
public static readonly string[] DockerRegistries = [DockerHub, GitHub];
2626

27-
public const string AlpineLatest = "alpine.3.20";
27+
public const string AlpineLatest = "alpine.3.21";
2828
public const string CentosStreamLatest = "centos.stream.9";
2929
public const string DebianLatest = "debian.12";
30-
public const string FedoraLatest = "fedora.40";
31-
public const string Ubuntu2004 = "ubuntu.20.04";
30+
public const string FedoraLatest = "fedora.41";
3231
public const string Ubuntu2204 = "ubuntu.22.04";
3332
public const string Ubuntu2404 = "ubuntu.24.04";
3433

@@ -40,7 +39,6 @@ public static class Constants
4039
CentosStreamLatest,
4140
DebianLatest,
4241
FedoraLatest,
43-
Ubuntu2004,
4442
Ubuntu2204,
4543
Ubuntu2404
4644
];

0 commit comments

Comments
 (0)