Skip to content

Commit 31bcfd2

Browse files
authored
Merge pull request #823 from b-ehlers/docker_build
Docker build: Include time of pull request to calculation of change time
2 parents e3c0cb4 + 32538f7 commit 31bcfd2

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.github/bin/docker_build

+3-2
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ import re
6262
import shlex
6363
import subprocess
6464
import time
65+
import dateutil.parser
6566
import dxf
6667
import requests.exceptions
67-
import dateutil.parser
6868

6969
docker_login = {}
7070
image_info = {}
@@ -379,7 +379,8 @@ def needs_rebuild(image, default_repository=None):
379379
rebuild_reason = "Files in docker context more recent than image"
380380
else:
381381
# clean git repository: use "git log" to get commit time
382-
proc = subprocess.run(["git", "-C", image["dir"], "log", "-n", "1",
382+
proc = subprocess.run(["git", "-C", image["dir"], "log",
383+
"--show-pulls", "-n", "1",
383384
"--pretty=tformat:%ct", "--", "."],
384385
capture_output=True,
385386
check=True,

0 commit comments

Comments
 (0)