|
|
@@ -11,6 +11,8 @@ DEFAULT_BRANCH = 'library'
|
|
|
logger = logging.getLogger(__name__)
|
|
|
logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s',
|
|
|
level='DEBUG')
|
|
|
+client = docker.Client()
|
|
|
+processed = {}
|
|
|
|
|
|
|
|
|
def fetch_buildlist(repository=None, branch=None):
|
|
|
@@ -25,40 +27,62 @@ def fetch_buildlist(repository=None, branch=None):
|
|
|
# cloning the whole repo everytime
|
|
|
dst_folder = git.clone_branch(repository, branch)
|
|
|
for buildfile in os.listdir(os.path.join(dst_folder, 'library')):
|
|
|
+ if buildfile == 'MAINTAINERS':
|
|
|
+ continue
|
|
|
f = open(os.path.join(dst_folder, 'library', buildfile))
|
|
|
for line in f:
|
|
|
logger.debug('{0} ---> {1}'.format(buildfile, line))
|
|
|
args = line.split()
|
|
|
try:
|
|
|
- #FIXME: delegate to workers instead?
|
|
|
+ if len(args) > 3:
|
|
|
+ raise RuntimeError('Incorrect line format, '
|
|
|
+ 'please refer to the docs')
|
|
|
+
|
|
|
+ url = None
|
|
|
+ ref = 'refs/heads/master'
|
|
|
+ tag = None
|
|
|
if len(args) == 1: # Just a URL, simple mode
|
|
|
- start_build(args[0], 'refs/heads/master', buildfile)
|
|
|
- elif len(args) == 3: # docker-tag url B:branch or T:tag
|
|
|
+ url = args[0]
|
|
|
+ elif len(args) == 2 or len(args) == 3: # docker-tag url
|
|
|
+ url = args[1]
|
|
|
+ tag = args[0]
|
|
|
+
|
|
|
+ if len(args) == 3: # docker-tag url B:branch or T:tag
|
|
|
ref = None
|
|
|
if args[2].startswith('B:'):
|
|
|
ref = 'refs/heads/' + args[2][2:]
|
|
|
elif args[2].startswith('T:'):
|
|
|
ref = 'refs/tags/' + args[2][2:]
|
|
|
+ elif args[2].startswith('C:'):
|
|
|
+ ref = args[2][2:]
|
|
|
else:
|
|
|
raise RuntimeError('Incorrect line format, '
|
|
|
'please refer to the docs')
|
|
|
- start_build(args[1], ref, buildfile, args[0])
|
|
|
+ img = start_build(url, ref, buildfile, tag)
|
|
|
+ processed['{0}@{1}'.format(url, ref)] = img
|
|
|
except Exception as e:
|
|
|
logger.exception(e)
|
|
|
f.close()
|
|
|
|
|
|
|
|
|
-def start_build(repository, ref, docker_repo, docker_tag=None):
|
|
|
- logger.info('Cloning {0} (ref: {1})'.format(repository, ref))
|
|
|
- dst_folder = git.clone(repository, ref)
|
|
|
- if not 'Dockerfile' in os.listdir(dst_folder):
|
|
|
- raise RuntimeError('Dockerfile not found in cloned repository')
|
|
|
- f = open(os.path.join(dst_folder, 'Dockerfile'))
|
|
|
- logger.info('Building using dockerfile...')
|
|
|
- #img_id, logs = docker.build_context(dst_folder)
|
|
|
- logger.info('Committing to library/{0}:{1}'.format(docker_repo,
|
|
|
+def start_build(repository, ref, docker_repo, docker_tag=None, namespace=None,
|
|
|
+ push=False):
|
|
|
+ docker_repo = '{0}/{1}'.format(namespace or 'library', docker_repo)
|
|
|
+ img_id = None
|
|
|
+ if '{0}@{1}'.format(repository, ref) not in processed.keys():
|
|
|
+ logger.info('Cloning {0} (ref: {1})'.format(repository, ref))
|
|
|
+ dst_folder = git.clone(repository, ref)
|
|
|
+ if not 'Dockerfile' in os.listdir(dst_folder):
|
|
|
+ raise RuntimeError('Dockerfile not found in cloned repository')
|
|
|
+ logger.info('Building using dockerfile...')
|
|
|
+ img_id, logs = client.build_context(dst_folder)
|
|
|
+
|
|
|
+ if not img_id:
|
|
|
+ img_id = processed['{0}@{1}'.format(repository, ref)]
|
|
|
+ logger.info('Committing to {0}:{1}'.format(docker_repo,
|
|
|
docker_tag or 'latest'))
|
|
|
- #docker.commit(img_id, 'library/' + docker_repo, docker_tag)
|
|
|
- logger.info('Pushing result to the main registry')
|
|
|
- #docker.push('library/' + docker_repo)
|
|
|
- f.close()
|
|
|
+ client.tag(img_id, docker_repo, docker_tag)
|
|
|
+ if push:
|
|
|
+ logger.info('Pushing result to the main registry')
|
|
|
+ client.push(docker_repo)
|
|
|
+ return img_id
|
shin-