Merge branch 'dockerfile' into 'main'

add dockerfilePath to values.yaml

See merge request !43

{{cookiecutter.project_slug}}/templates/{{cookiecutter.template_base_name}}/buildconfig.yaml

@@ -26,10 +26,20 @@ spec:
     sourceSecret:
       name: k8sgitlab
     {%- if stages %}{% raw %}{{- if eq $stage "staging" }}{% endraw %}{% endif %}
-    contextDir: "{% raw %}{{ $.Values.contextDir }}{% endraw %}"
+    contextDir: {% raw %}{{ $.Values.contextDir | quote }}{% endraw %}
+    {%- raw %}
+    {{- if $.Values.dockerfilePath }}
+    dockerfilePath: {{ $.Values.dockerfilePath | quote }}
+    {{- end }}
+    {%- endraw %}
     {%- if stages %}
     {% raw %}{{- else if eq $stage "test" }}{% endraw %}
-    contextDir: "{% raw %}{{ $.Values.testContextDir }}{% endraw %}"
+    contextDir: {% raw %}{{ $.Values.testContextDir | quote }}{% endraw %}
+    {%- raw %}
+    {{- if $.Values.testDockerfilePath }}
+    dockerfilePath: {{ $.Values.testDockerfilePath | quote }}
+    {{- end }}
+    {%- endraw %}
     {% raw %}{{- end }}{% endraw %}
     {% raw %}{{- else }}{% endraw %}
     dockerfile: |

{{cookiecutter.project_slug}}/values.yaml

@@ -71,11 +71,19 @@ buildTriggers: []
 # directory in the git repository where the Dockerfile is located
 contextDir: "docker/{{ cookiecutter.template_base_name }}"
 
+# path to the Dockerfile, relative to the given contextDir. If empty, 
+# Dockerfile is used
+dockerfilePath: null
+
 {%- if cookiecutter.include_build_test_stage == "yes" %}
 
 # directory in the git repository where the Dockerfile for the test setup is 
 # located
 testContextDir: "docker/{{ cookiecutter.template_base_name }}/tests"
+
+# path to the Dockerfile for the test stage, relative to the given 
+# testContextDir. If empty, Dockerfile is used
+testDockerfilePath: null
 {%- endif %}
 
 {%- if cookiecutter.include_build_test_stage == "yes" %}