Skip to content

Commit a0d11fe

Browse files
arturcicarturcic
committed
renamed dotnet_distro => docker_distro
1 parent 47b5c76 commit a0d11fe

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

‎.github/actions/build-deps-manifest/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ runs:
3232
run: |
3333
dotnet run/build.dll `
3434
--target=DockerBuildDeps --arch=${{ inputs.arch }} `
35-
--dotnet_distro=${{ inputs.docker_distro }} --docker_registry=${{ inputs.docker_registry_name }} `
35+
--docker_distro=${{ inputs.docker_distro }} --docker_registry=${{ inputs.docker_registry_name }} `
3636
--push_images=${{ env.PUSH_IMAGES }} --verbosity=diagnostic

‎.github/actions/build-deps/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ runs:
3535
run: |
3636
dotnet run/build.dll `
3737
--target=DockerBuildDeps --arch=${{ inputs.arch }} `
38-
--dotnet_distro=${{ inputs.docker_distro }} --docker_registry=${{ inputs.docker_registry_name }} `
38+
--docker_distro=${{ inputs.docker_distro }} --docker_registry=${{ inputs.docker_registry_name }} `
3939
--push_images=${{ env.PUSH_IMAGES }} --verbosity=diagnostic

‎.github/workflows/build-images.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
dotnet run/build.dll `
9696
--target=DockerBuildImages --arch=${{ matrix.arch }} `
9797
--dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
98-
--dotnet_distro=${{ matrix.distro }} --docker_registry=dockerhub `
98+
--docker_distro=${{ matrix.distro }} --docker_registry=dockerhub `
9999
--push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
100100
- name: Login to GitHub Container Registry
101101
if: success() && env.PUSH_IMAGES == 'true'
@@ -110,7 +110,7 @@ jobs:
110110
dotnet run/build.dll `
111111
--target=DockerBuildImages --arch=${{ matrix.arch }} `
112112
--dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
113-
--dotnet_distro=${{ matrix.distro }} --docker_registry=github `
113+
--docker_distro=${{ matrix.distro }} --docker_registry=github `
114114
--push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
115115
116116
build_images_manifest:
@@ -164,7 +164,7 @@ jobs:
164164
dotnet run/build.dll `
165165
--target=DockerBuildImagesManifest `
166166
--dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
167-
--dotnet_distro=${{ matrix.distro }} --docker_registry=dockerhub `
167+
--docker_distro=${{ matrix.distro }} --docker_registry=dockerhub `
168168
--push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
169169
- name: Login to GitHub Container Registry
170170
if: success() && env.PUSH_IMAGES == 'true'
@@ -179,5 +179,5 @@ jobs:
179179
dotnet run/build.dll `
180180
--target=DockerBuildImagesManifest `
181181
--dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
182-
--dotnet_distro=${{ matrix.distro }} --docker_registry=github `
182+
--docker_distro=${{ matrix.distro }} --docker_registry=github `
183183
--push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic

‎build/.run/DockerBuild (runtime).run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="DockerBuild (runtime)" type="DotNetProject" factoryName=".NET Project">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --dotnet_version=8.0 --dotnet_variant=runtime --dotnet_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --dotnet_version=8.0 --dotnet_variant=runtime --docker_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<option name="USE_EXTERNAL_CONSOLE" value="0" />

‎build/.run/DockerBuild (sdk).run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="DockerBuild (sdk)" type="DotNetProject" factoryName=".NET Project">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
4-
<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" />
4+
<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" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<option name="USE_EXTERNAL_CONSOLE" value="0" />

‎build/.run/DockerBuild.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="DockerBuild" type="DotNetProject" factoryName=".NET Project">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --dotnet_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --docker_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<option name="USE_EXTERNAL_CONSOLE" value="0" />

‎build/.run/DockerBuildDeps (dockerhub).run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="DockerBuildDeps (dockerhub)" type="DotNetProject" factoryName=".NET Project">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuildDeps --dotnet_distro=alpine.3.20 --docker_registry=dockerhub --verbosity=diagnostic --push_images=true" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuildDeps --docker_distro=alpine.3.20 --docker_registry=dockerhub --verbosity=diagnostic --push_images=true" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<option name="USE_EXTERNAL_CONSOLE" value="0" />

‎build/.run/DockerBuildDeps (gihub).run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="DockerBuildDeps (gihub)" type="DotNetProject" factoryName=".NET Project">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuildDeps --dotnet_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic --push_images=true" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuildDeps --docker_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic --push_images=true" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<option name="USE_EXTERNAL_CONSOLE" value="0" />

‎build/build/Infra/BuildLifetime.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public override void Setup(BuildContext context, ISetupContext info)
99
var dockerRegistry = context.Argument("docker_registry", "").ToLower();
1010
var dotnetVersion = context.Argument("dotnet_version", "").ToLower();
1111
var dotnetVariant = context.Argument("dotnet_variant", "").ToLower();
12-
var dockerDistro = context.Argument("dotnet_distro", "").ToLower();
12+
var dockerDistro = context.Argument("docker_distro", "").ToLower();
1313
var pushImages = context.Argument("push_images", false);
1414

1515
context.Information($"Building for Version: {dotnetVersion}, Variant: {dotnetVariant}, Distro: {dockerDistro}, Push: {pushImages}");

0 commit comments

Comments
 (0)