Skip to content
Snippets Groups Projects
Commit 83464826 authored by Tobias Leibner's avatar Tobias Leibner
Browse files

apply python formatter

parent 510e18d7
No related branches found
No related tags found
No related merge requests found
...@@ -41,18 +41,18 @@ except ImportError: ...@@ -41,18 +41,18 @@ except ImportError:
from docker.utils.json_stream import json_stream from docker.utils.json_stream import json_stream
TAG_MATRIX = { TAG_MATRIX = {
# 'debian-unstable_gcc_full': { # 'debian-unstable_gcc_full': {
# 'cc': 'gcc', # 'cc': 'gcc',
# 'cxx': 'g++', # 'cxx': 'g++',
# 'deletes': "", # 'deletes': "",
# 'base': 'debian-unstable' # 'base': 'debian-unstable'
# }, # },
# 'debian_gcc_full': { # 'debian_gcc_full': {
# 'cc': 'gcc', # 'cc': 'gcc',
# 'cxx': 'g++', # 'cxx': 'g++',
# 'deletes': "", # 'deletes': "",
# 'base': 'debian' # 'base': 'debian'
# }, # },
'debian_clang_full': { 'debian_clang_full': {
'cc': 'clang', 'cc': 'clang',
'cxx': 'clang++', 'cxx': 'clang++',
...@@ -161,14 +161,15 @@ def _build_combination(tag_matrix, dockerdir, module, commit, refname): ...@@ -161,14 +161,15 @@ def _build_combination(tag_matrix, dockerdir, module, commit, refname):
repo = 'dunecommunity/{}-testing_{}'.format(module, tag) repo = 'dunecommunity/{}-testing_{}'.format(module, tag)
with Timer('docker build ', logger.info): with Timer('docker build ', logger.info):
buildargs = { buildargs = {'COMMIT': commit, 'CC': cc, 'project_name': module, 'BASE': settings['base']}
'COMMIT': commit,
'CC': cc,
'project_name': module,
'BASE': settings['base']
}
img = _docker_build( img = _docker_build(
client, logger, rm=True, buildargs=buildargs, pull=True, tag='{}:{}'.format(repo, commit), path=dockerdir) client,
logger,
rm=True,
buildargs=buildargs,
pull=True,
tag='{}:{}'.format(repo, commit),
path=dockerdir)
img.tag(repo, refname) img.tag(repo, refname)
with Timer('docker push {}:{}|{}'.format(repo, refname, commit), logger.info): with Timer('docker push {}:{}|{}'.format(repo, refname, commit), logger.info):
client.images.push(repo, tag=refname) client.images.push(repo, tag=refname)
......
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