improve(bakery) support for custom organization providing prebaked conductor images

Author: Voronenko

bakery.py

@@ -15,12 +15,15 @@
 
 version = container.__version__
 
-BASE_DISTRO = os.getenv('BASE_DISTRO');
+BASE_DISTRO = os.getenv('BASE_DISTRO')
+CONDUCTOR_PROVIDER = os.getenv('CONDUCTOR_PROVIDER') or 'ansible'
 
 if BASE_DISTRO:
-    subprocess.check_call(['python', 'setup.py', 'prebake', '--distros', BASE_DISTRO])
+    print "building selected prebake distros %s for organization %s" % (BASE_DISTRO, CONDUCTOR_PROVIDER)
+    subprocess.check_call(['python', 'setup.py', 'prebake', '--distros', BASE_DISTRO, '--conductor-provider', CONDUCTOR_PROVIDER])
 else:
-    subprocess.check_call(['python', 'setup.py', 'prebake'])
+    print "building prebake distros for organization %s" % (CONDUCTOR_PROVIDER)
+    subprocess.check_call(['python', 'setup.py', 'prebake', '--conductor-provider', CONDUCTOR_PROVIDER])
 
 for distro in ([BASE_DISTRO] if BASE_DISTRO else PREBAKED_DISTROS):
     print('Uploading %s...' % distro)
@@ -30,9 +33,9 @@
            'ansible/container-conductor-%s:%s' % (distro_key, version)])
     subprocess.check_call(['docker', 'tag',
                            'container-conductor-%s:%s' % (distro_key, version),
-                           'ansible/container-conductor-%s:%s' % (distro_key, version)])
+                           '%s/container-conductor-%s:%s' % (CONDUCTOR_PROVIDER, distro_key, version)])
     print(['docker', 'push',
-           'ansible/container-conductor-%s:%s' % (distro_key, version)])
+           '%s/container-conductor-%s:%s' % (CONDUCTOR_PROVIDER, distro_key, version)])
     subprocess.check_call(['docker', 'push',
-                           'ansible/container-conductor-%s:%s' % (distro_key, version)])
+                           '%s/container-conductor-%s:%s' % (CONDUCTOR_PROVIDER, distro_key, version)])
 

container/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
-__version__ = '0.9.3rc0'
+__version__ = '0.9.3rc2'
 
 import os
 import functools

container/core.py

@@ -127,7 +127,7 @@ def hostcmd_init(base_path, project=None, force=False, config_file=None, **kwarg
         logger.info('Ansible Container initialized.')
 
 @host_only
-def hostcmd_prebake(distros, debug=False, cache=True, ignore_errors=False):
+def hostcmd_prebake(distros, debug=False, cache=True, ignore_errors=False, conductor_provider='ansible'):
     logger.info('Prebaking distros...', distros=distros, cache=cache)
     engine_obj = load_engine(['BUILD_CONDUCTOR'], 'docker', os.getcwd(), {}, debug=debug)
     from .docker.engine import PREBAKED_DISTROS
@@ -137,7 +137,9 @@ def hostcmd_prebake(distros, debug=False, cache=True, ignore_errors=False):
             engine_obj.build_conductor_image(os.getcwd(),
                                              distro,
                                              prebaking=True,
-                                             cache=cache)
+                                             cache=cache,
+                                             conductor_provider=conductor_provider
+                                             )
         except Exception as e:
             logger.exception('Failure building prebaked image for %s', distro)
             if ignore_errors:
@@ -176,12 +178,13 @@ def hostcmd_build(base_path, project_name, engine_name, vars_files=None, config_
                 env_vars = environment
         if kwargs.get('with_variables'):
             env_vars += kwargs['with_variables']
-
+        config_conductor_provider = config.get('settings', {}).get('conductor_provider', "ansible")
         engine_obj.build_conductor_image(
             base_path,
             config.conductor_base,
             cache=conductor_cache,
-            environment=env_vars
+            environment=env_vars,
+            conductor_provider=config_conductor_provider
         )
     else:
         logger.warning(u'%s does not support building the Conductor image.',
@@ -555,9 +558,11 @@ def set_path_ownership(path, uid, gid):
     os.chown(path, uid, gid)
     for root, dirs, files in os.walk(path):
         for d in dirs:
-            os.chown(os.path.join(root, d), uid, gid)
+            if not(os.path.islink(os.path.join(root, d))):
+                os.chown(os.path.join(root, d), uid, gid)
         for f in files:
-            os.chown(os.path.join(root, f), uid, gid)
+            if not(os.path.islink(os.path.join(root, f))):
+                os.chown(os.path.join(root, f), uid, gid)
 
 
 @conductor_only

container/docker/engine.py

@@ -87,7 +87,7 @@
     'ubuntu:precise': ['ubuntu:12.04'],
     'ubuntu:trusty': ['ubuntu:14.04'],
     'ubuntu:xenial': ['ubuntu:16.04'],
-    'ubuntu:zesty': ['ubuntu:17.04'],
+    # 'ubuntu:zesty': ['ubuntu:17.04'],
     'alpine:3.5': ['alpine:latest'],
     'alpine:3.4': []
 }
@@ -989,7 +989,7 @@ def _prepare_prebake_manifest(base_path, base_image, temp_dir, tarball):
         tarball.add(os.path.join(req_yml_dir, 'conductor-requirements.yml'),
                     arcname='container-src/conductor-build/conductor-requirements.yml')
 
-    def _prepare_conductor_manifest(self, base_path, base_image, temp_dir, tarball):
+    def _prepare_conductor_manifest(self, base_path, base_image, temp_dir, tarball, conductor_provider="ansible"):
         source_dir = os.path.normpath(base_path)
 
         for filename in ['ansible.cfg', 'ansible-requirements.txt',
@@ -1013,7 +1013,7 @@ def _prepare_conductor_manifest(self, base_path, base_image, temp_dir, tarball):
                 container.__version__
             )
             if not self.get_image_id_by_tag(conductor_base):
-                conductor_base = 'ansible/%s' % conductor_base
+                conductor_base = '%s/%s' % (conductor_provider, conductor_base)
         else:
             conductor_base = 'container-conductor-%s:%s' % (
                 base_image.replace(':', '-'),
@@ -1042,7 +1042,7 @@ def _prepare_conductor_manifest(self, base_path, base_image, temp_dir, tarball):
 
     @log_runs
     @host_only
-    def build_conductor_image(self, base_path, base_image, prebaking=False, cache=True, environment=None):
+    def build_conductor_image(self, base_path, base_image, prebaking=False, cache=True, environment=None, conductor_provider="ansible"):
         if environment is None:
             environment = []
         with utils.make_temp_dir() as temp_dir:
@@ -1098,11 +1098,6 @@ def build_conductor_image(self, base_path, base_image, prebaking=False, cache=Tr
             tarball.add(os.path.join(temp_dir, 'Dockerfile'),
                         arcname='Dockerfile')
 
-            #for context_file in ['builder.sh', 'ansible-container-inventory.py',
-            #                     'ansible.cfg', 'wait_on_host.py', 'ac_galaxy.py']:
-            #    tarball.add(os.path.join(TEMPLATES_PATH, context_file),
-            #                arcname=context_file)
-
             if prebaking:
                 self.client.images.pull(*base_image.split(':', 1))
                 self._prepare_prebake_manifest(base_path, base_image, temp_dir,
@@ -1111,7 +1106,7 @@ def build_conductor_image(self, base_path, base_image, prebaking=False, cache=Tr
                                                      container.__version__)
             else:
                 self._prepare_conductor_manifest(base_path, base_image, temp_dir,
-                                                 tarball)
+                                                 tarball, conductor_provider)
                 tag = self.image_name_for_service('conductor')
             logger.debug('Context manifest:')
             for tarinfo_obj in tarball.getmembers():

container/templates/init/.dockerignore.j2

@@ -5,3 +5,7 @@
 ansible-deployment/
 *.retry
 .DS_Store
+p-env
+venv
+.p-env
+.venv