From f75a30a66a7cca00120d7442f8714b9d172bf424 Mon Sep 17 00:00:00 2001 From: tunahanertekin Date: Thu, 18 May 2023 10:03:40 +0300 Subject: [PATCH] fix(buildargs): initialize buildargs as map if empty --- pipelines/freecad.yaml | 2 -- pkg/api/step.go | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pipelines/freecad.yaml b/pipelines/freecad.yaml index 806225b..bb3a181 100644 --- a/pipelines/freecad.yaml +++ b/pipelines/freecad.yaml @@ -28,6 +28,4 @@ steps: baseStep: "xfce-withuser" path: "dockerfiles/freecad" dockerfile: "Dockerfile.freecad" - buildArgs: - "FREECAD_VERSION": "0.18.4+dfsg2-1ubuntu4" push: false \ No newline at end of file diff --git a/pkg/api/step.go b/pkg/api/step.go index 3d31774..e6cac36 100644 --- a/pkg/api/step.go +++ b/pkg/api/step.go @@ -27,6 +27,7 @@ type Step struct { func (step *Step) Default(lc LaunchConfig) { step.setImageName(lc) step.setContext(lc) + step.setBuildArgs(lc) step.setBaseImage(lc) } @@ -40,6 +41,12 @@ func (step *Step) setContext(lc LaunchConfig) { } } +func (step *Step) setBuildArgs(lc LaunchConfig) { + if len(step.BuildArgs) == 0 { + step.BuildArgs = make(map[string]*string) + } +} + func (step *Step) setBaseImage(lc LaunchConfig) { if _, ok := step.BuildArgs["base_image"]; !ok { baseStep, _ := step.GetBaseStep(lc)