Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-03 05:23:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make image_name a function

Browse source
This commit is contained in:
Simon Sapin 2018-09-20 18:36:38 +02:00
parent c9d698fad7
commit 5f0c95db47
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
decisionlib.py
View file

@ -67,7 +67,7 @@ class DecisionTask:
raise raise
return self.create_task( return self.create_task(
task_name="docker image build task for image: " + self.image_name(dockerfile), task_name="docker image build task for image: " + image_name(dockerfile),
script=""" script="""
echo "$DOCKERFILE" | docker build -t taskcluster-built - echo "$DOCKERFILE" | docker build -t taskcluster-built -
docker save taskcluster-built | lz4 > /%s docker save taskcluster-built | lz4 > /%s
@ -94,16 +94,6 @@ class DecisionTask:
}, },
) )
def image_name(self, dockerfile):
basename = os.path.basename(dockerfile)
suffix = ".dockerfile"
if basename == "Dockerfile":
return os.path.basename(os.path.dirname(os.path.abspath(dockerfile)))
elif basename.endswith(suffix):
return basename[:-len(suffix)]
else:
return basename
def create_task(self, *, task_name, script, max_run_time_minutes, def create_task(self, *, task_name, script, max_run_time_minutes,
docker_image=None, dockerfile=None, # One of these is required docker_image=None, dockerfile=None, # One of these is required
artifacts=None, dependencies=None, env=None, cache=None, scopes=None, artifacts=None, dependencies=None, env=None, cache=None, scopes=None,
@ -195,5 +185,16 @@ class DecisionTask:
return task_id return task_id
def image_name(dockerfile):
basename = os.path.basename(dockerfile)
suffix = ".dockerfile"
if basename == "Dockerfile":
return os.path.basename(os.path.dirname(os.path.abspath(dockerfile)))
elif basename.endswith(suffix):
return basename[:-len(suffix)]
else:
return basename
def deindent(string): def deindent(string):
return re.sub("\n +", " \n ", string) return re.sub("\n +", " \n ", string)