vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add a synthetic .git directory containing the commit sha so that 'git rev-parse HEAD' works from inside builds

Browse source
This commit is contained in:
Joseph Schorr 2014-10-10 17:20:07 -04:00
parent 49f8629566
commit 07f3bd6f8c
2 changed files with 48 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
workers/dockerfilebuild.py
View file

@ -38,8 +38,7 @@ TIMEOUT_PERIOD_MINUTES = 20
CACHE_EXPIRATION_PERIOD_HOURS = 24
NO_TAGS = ['<none>:<none>']
RESERVATION_TIME = (TIMEOUT_PERIOD_MINUTES + 5) * 60
DOCKER_BASE_URL = None # Set this if you want to use a different docker URL/socket.
DOCKER_BASE_URL = os.environ.get('DOCKER_HOST', None)
def matches_system_error(status_str):
""" Returns true if the given status string matches a known system error in the
@ -521,8 +520,12 @@ class DockerfileBuildWorker(Worker):
repository_build.uuid)
# Lookup and save the version of docker being used.
docker_cl = Client(base_url = DOCKER_BASE_URL)
docker_version = docker_cl.version().get('Version', '')
try:
docker_cl = Client(base_url = DOCKER_BASE_URL)
docker_version = docker_cl.version().get('Version', '')
except ConnectionError as exc:
raise WorkerUnhealthyException(exc.message)
dash = docker_version.find('-')
# Strip any -tutum or whatever off of the version.