Skip to content
Snippets Groups Projects
Commit 23f71412 authored by Tamas Gal's avatar Tamas Gal :speech_balloon:
Browse files

Merge branch '5-publish-script-fails-on-new-dockerfile-from-merge' into 'master'

Resolve "Publish script fails on new dockerfile from merge"

Closes #5

See merge request common/dockerfiles!9
parents 5f3fdd06 278445de
No related branches found
No related tags found
No related merge requests found
...@@ -13,7 +13,7 @@ def get_changed_dockerfiles(vs_master=False): ...@@ -13,7 +13,7 @@ def get_changed_dockerfiles(vs_master=False):
if vs_master: if vs_master:
diff_cmd = "git --no-pager diff --name-only origin/master" diff_cmd = "git --no-pager diff --name-only origin/master"
else: else:
diff_cmd = "git diff-tree --no-commit-id --name-only -r HEAD" diff_cmd = "git diff --name-only HEAD HEAD~1"
child = sp.Popen(diff_cmd, shell=True, stdout=sp.PIPE, stderr=sp.PIPE) child = sp.Popen(diff_cmd, shell=True, stdout=sp.PIPE, stderr=sp.PIPE)
out, _ = child.communicate() out, _ = child.communicate()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment