do not set entrypoint when it is None

Author: kaizhang-shanxi

apis/base_app.py

@@ -11,7 +11,6 @@
     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,
@@ -175,20 +174,10 @@ def lain_config(self):
     def _get_lain_config(self):
         if self.meta == '' or self.meta_version == '':
             return None
-        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
+        config = LainConf()
+        config.load(self.meta, self.meta_version, self.default_image,
+                    registry=PRIVATE_REGISTRY, domains=get_domains())
+        return config
 
     @property
     def app_spec(self):

apis/specs.py

@@ -112,8 +112,8 @@ class ContainerSpec(ImSpec):
     Volumes = []
     SystemVolumes = []
     CloudVolumes = []
-    Command = []
-    Entrypoint = []
+    Command = None
+    Entrypoint = None
     CpuLimit = 0
     MemoryLimit = 0
     Expose = 0
@@ -471,14 +471,8 @@ def render_container_spec_from_json(app_name, spec_json):
         cloud_volumes = []
     c.CloudVolumes = [render_cloud_volumes_spec_from_json(
         cv) for cv in cloud_volumes]
-    command = spec_json.get('Command')
-    if not command:
-        command = []
-    c.Command = command
-    entrypoint = spec_json.get('entrypoint')
-    if not entrypoint:
-        entrypoint = []
-    c.Entrypoint = entrypoint
+    c.Command = spec_json.get('Command')
+    c.Entrypoint = spec_json.get('Entrypoint')
     c.CpuLimit = spec_json['CpuLimit']
     c.MemoryLimit = spec_json['MemoryLimit']
     c.Expose = spec_json['Expose'] if spec_json['Expose'] else 0

apis/tests/test_specs.py

@@ -48,7 +48,7 @@ def test_ContainerSpec_smoke():
     assert s.CreateAt is None
     assert s.Version == 0
     assert s.Image == ""
-    assert s.Command == []
+    assert s.Command == None
     assert s.LogConfig is None
 
 

apis/utils.py

@@ -171,31 +171,6 @@ 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

@@ -17,6 +17,8 @@ build:
       - touch /sbin/modprobe && chmod +x /sbin/modprobe
       - pip install -r pip-req.txt
   script:
+    - mkdir -p /root/.pip
+    - cp -f pip.conf /root/.pip/pip.conf
     - cd $(npm root -g)/npm && npm install fs-extra && sed -i -e s/graceful-fs/fs-extra/ -e s/fs\.rename/fs.move/ ./lib/utils/rename.js # fix npm error
     - cd $GOPATH/src/github.com/laincloud/archon && git pull && gobuildweb dist && cp archon-0.1.zip /lain/app/ # note docker may use cache, you should delete the old image
     - unzip -o /lain/app/archon-0.1.zip

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.7
+lain-sdk==2.4.0
 -e git+https://github.com/projectcalico/[email protected]#egg=pycalico-0.8.0-dev

pip.conf

@@ -0,0 +1,3 @@
+[global]
+index-url = https://mirrors.ustc.edu.cn/pypi/web/simple
+format = columns