renamed dotnet_distro => docker_distro

GitTools · Jan 20, 2025 · f969e40 · f969e40
1 parent 33d036e
commit f969e40
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/.github/actions/build-deps-manifest/action.yml b/.github/actions/build-deps-manifest/action.yml
@@ -32,5 +32,5 @@ runs:
             run: |
                 dotnet run/build.dll `
                         --target=DockerBuildDepsManifest `
-                        --dotnet_distro=${{ inputs.docker_distro }} --docker_registry=${{ inputs.docker_registry_name }} `
+                        --docker_distro=${{ inputs.docker_distro }} --docker_registry=${{ inputs.docker_registry_name }} `
                         --push_images=${{ env.PUSH_IMAGES }} --verbosity=diagnostic
diff --git a/.github/actions/build-deps/action.yml b/.github/actions/build-deps/action.yml
@@ -35,5 +35,5 @@ runs:
             run: |
                 dotnet run/build.dll `
                         --target=DockerBuildDeps --arch=${{ inputs.arch }} `
-                        --dotnet_distro=${{ inputs.docker_distro }} --docker_registry=${{ inputs.docker_registry_name }} `
+                        --docker_distro=${{ inputs.docker_distro }} --docker_registry=${{ inputs.docker_registry_name }} `
                         --push_images=${{ env.PUSH_IMAGES }} --verbosity=diagnostic
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -95,7 +95,7 @@ jobs:
                     dotnet run/build.dll `
                         --target=DockerBuildImages --arch=${{ matrix.arch }} `
                         --dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
-                        --dotnet_distro=${{ matrix.distro }} --docker_registry=dockerhub `
+                        --docker_distro=${{ matrix.distro }} --docker_registry=dockerhub `
                         --push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
             -   name: Login to GitHub Container Registry
                 if: success() && env.PUSH_IMAGES == 'true'
@@ -110,7 +110,7 @@ jobs:
                     dotnet run/build.dll `
                         --target=DockerBuildImages --arch=${{ matrix.arch }} `
                         --dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
-                        --dotnet_distro=${{ matrix.distro }} --docker_registry=github `
+                        --docker_distro=${{ matrix.distro }} --docker_registry=github `
                         --push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
 
     build_images_manifest:
@@ -164,7 +164,7 @@ jobs:
                     dotnet run/build.dll `
                         --target=DockerBuildImagesManifest `
                         --dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
-                        --dotnet_distro=${{ matrix.distro }} --docker_registry=dockerhub `
+                        --docker_distro=${{ matrix.distro }} --docker_registry=dockerhub `
                         --push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
             -   name: Login to GitHub Container Registry
                 if: success() && env.PUSH_IMAGES == 'true'
@@ -179,5 +179,5 @@ jobs:
                     dotnet run/build.dll `
                         --target=DockerBuildImagesManifest `
                         --dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
-                        --dotnet_distro=${{ matrix.distro }} --docker_registry=github `
+                        --docker_distro=${{ matrix.distro }} --docker_registry=github `
                         --push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
diff --git a/build/.run/DockerBuild (runtime).run.xml b/build/.run/DockerBuild (runtime).run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="DockerBuild (runtime)" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --dotnet_version=8.0 --dotnet_variant=runtime --dotnet_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --dotnet_version=8.0 --dotnet_variant=runtime --docker_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />

diff --git a/build/.run/DockerBuild (sdk).run.xml b/build/.run/DockerBuild (sdk).run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="DockerBuild (sdk)" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --dotnet_version=8.0 --dotnet_variant=sdk --dotnet_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic --push_images=true" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --dotnet_version=8.0 --dotnet_variant=sdk --docker_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic --push_images=true" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />

diff --git a/build/.run/DockerBuild.run.xml b/build/.run/DockerBuild.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="DockerBuild" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --dotnet_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --docker_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />

diff --git a/build/.run/DockerBuildDeps (dockerhub).run.xml b/build/.run/DockerBuildDeps (dockerhub).run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="DockerBuildDeps (dockerhub)" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuildDeps --dotnet_distro=alpine.3.20 --docker_registry=dockerhub --verbosity=diagnostic --push_images=true" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuildDeps --docker_distro=alpine.3.20 --docker_registry=dockerhub --verbosity=diagnostic --push_images=true" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />

diff --git a/build/.run/DockerBuildDeps (gihub).run.xml b/build/.run/DockerBuildDeps (gihub).run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="DockerBuildDeps (gihub)" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuildDeps --dotnet_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic --push_images=true" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuildDeps --docker_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic --push_images=true" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />

diff --git a/build/build/Infra/BuildLifetime.cs b/build/build/Infra/BuildLifetime.cs
@@ -9,7 +9,7 @@ public override void Setup(BuildContext context, ISetupContext info)
         var dockerRegistry = context.Argument("docker_registry", "").ToLower();
         var dotnetVersion = context.Argument("dotnet_version", "").ToLower();
         var dotnetVariant = context.Argument("dotnet_variant", "").ToLower();
-        var dockerDistro = context.Argument("dotnet_distro", "").ToLower();
+        var dockerDistro = context.Argument("docker_distro", "").ToLower();
         var pushImages = context.Argument("push_images", false);
 
         context.Information($"Building for Version: {dotnetVersion}, Variant: {dotnetVariant}, Distro: {dockerDistro}, Push: {pushImages}");