Skip to content

Commit bc2c5ea

Browse files
fix: updated default case
1 parent 53e3c20 commit bc2c5ea

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/taskgraph/config.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
Required("trust-domain"): str,
2929
Optional(
3030
"docker-image-kind",
31-
default="docker-image",
3231
description="Name of the docker image kind (default: docker-image)",
3332
): str,
3433
Required("task-priority"): optionally_keyed_by(

src/taskgraph/util/docker.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,15 @@ def stream_context_tar(topsrcdir, context_dir, out_file, args=None):
209209
def image_paths(graph_config):
210210
"""Return a map of image name to paths containing their Dockerfile."""
211211

212+
try:
213+
docker_image_kind = graph_config["docker-image-kind"]
214+
except KeyError:
215+
docker_image_kind = "docker-image"
216+
212217
config = load_yaml(
213218
graph_config.root_dir,
214219
"kinds",
215-
graph_config["docker-image-kind"],
220+
docker_image_kind,
216221
"kind.yml",
217222
)
218223

taskcluster/config.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ index:
1414

1515
task-priority: low
1616

17-
docker-image-kind: docker-image
18-
1917
taskgraph:
2018
register: self_taskgraph:register
2119
decision-parameters: 'self_taskgraph.custom_parameters:decision_parameters'

0 commit comments

Comments
 (0)