Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-02 21:13:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add %include support to dockerfiles

Browse source
This commit is contained in:
Simon Sapin 2018-09-21 12:26:39 +02:00
parent a6a8bdb695
commit 6ced45fd61
5 changed files with 36 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

17
decisionlib.py
View file

@ -80,8 +80,7 @@ class DecisionTask:
return task_id
def find_or_build_docker_image(self, dockerfile):
with open(dockerfile, "rb") as f:
dockerfile_contents = f.read()
dockerfile_contents = expand_dockerfile(dockerfile)
digest = hashlib.sha256(dockerfile_contents).hexdigest()
return self.find_or_create_task(
@ -210,5 +209,19 @@ def image_name(dockerfile):
return basename
def expand_dockerfile(dockerfile):
with open(dockerfile, "rb") as f:
dockerfile_contents = f.read()
include_marker = b"% include"
if not dockerfile_contents.startswith(include_marker):
return dockerfile_contents
include_line, _, rest = dockerfile_contents.partition(b"\n")
included = include_line[len(include_marker):].strip().decode("utf8")
path = os.path.join(os.path.dirname(dockerfile), included)
return b"\n".join([expand_dockerfile(path), rest])
def deindent(string):
return re.sub("\n +", " \n ", string)