Merge pull request #47 from bibaijin/master

respect ENTRYPOINT and CMD in Dockerfile

Author: bibaijin

apis/base_app.py

@@ -11,6 +11,7 @@
     normalize_meta_version,
     search_images_from_registry,
     get_meta_from_registry,
+    get_image_config_from_registry,
     read_from_etcd,
     delete_from_etcd,
     set_value_to_etcd,
@@ -174,10 +175,19 @@ def lain_config(self):
     def _get_lain_config(self):
         if self.meta == '' or self.meta_version == '':
             return None
-        config = LainConf()
-        config.load(self.meta, self.meta_version, self.default_image,
+        try:
+            config = LainConf()
+            image_config = get_image_config_from_registry(self.appname, self.meta_version)
+            config.load(self.meta, self.meta_version, self.default_image,
+                    image_config=image_config, registry=PRIVATE_REGISTRY,
+                    domains=get_domains())
+            return config
+        except Exception as e:
+            logger.error('_get_lain_config() failed, error: %s' % e)
+            config = LainConf()
+            config.load(self.meta, self.meta_version, self.default_image,
                     registry=PRIVATE_REGISTRY, domains=get_domains())
-        return config
+            return config
 
     @property
     def app_spec(self):

apis/utils.py

@@ -120,7 +120,7 @@ def _get_registry_access_header(app, registry):
         jwt = Authorize.get_jwt_with_appname(app)
         header = {'Authorization': 'Bearer %s' % jwt}
     else:
-        header = ''
+        header = {}
     return header
 
 
@@ -171,6 +171,28 @@ def get_meta_from_registry(app, meta_version, registry=None):
     return y
 
 
+def get_image_config_from_registry(app, meta_version, registry=None):
+    logger.debug("ready get meta version %s for app %s from registry" %
+                 (meta_version, app))
+    meta_version = normalize_meta_version(meta_version)
+    if not registry:
+        registry = PRIVATE_REGISTRY
+
+    headers = _get_registry_access_header(app, registry)
+    headers['Accept'] = 'application/vnd.docker.distribution.manifest.v2+json'
+    url = 'http://%s/v2/%s/manifests/release-%s' % (registry, app, meta_version)
+    resp = requests.get(url, headers=headers)
+    if resp.status_code != 200:
+        raise Exception("requests.get(%s, %s) failed, resp: %s" % (url, headers, resp))
+    config_digest = resp.json()['config']['digest']
+    headers = _get_registry_access_header(app, registry)
+    url = 'http://%s/v2/%s/blobs/%s' % (registry, app, config_digest)
+    resp = requests.get(url, headers=headers)
+    if resp.status_code != 200:
+        raise Exception("requests.get(%s, %s) failed, resp: %s" % (url, headers, resp))
+    return resp.json()['config']
+
+
 def shell(cmd):
     retcode = 0
     output = None

lain.yaml

@@ -5,6 +5,7 @@ build:
   prepare:
     version: "20170612"
     script:
+      - yum install -y yum-plugin-ovl
       - yum install -y gcc-c++
       - git clone --depth=1 https://github.com/golang/sys.git $GOPATH/src/golang.org/x/sys
       - git clone --depth=1 https://github.com/golang/net.git $GOPATH/src/golang.org/x/net

pip-req.txt

@@ -26,5 +26,5 @@ pyjwt==1.4.0
 netaddr==0.7.18
 raven==5.13.0
 mysqlclient==1.3.10
-lain-sdk==2.3.5
+lain-sdk==2.3.7
 -e git+https://github.com/projectcalico/[email protected]#egg=pycalico-0.8.0-dev