chore(docker): update docker client

Author: duanhongyi

charts/controller/templates/controller-deployment.yaml

@@ -66,11 +66,13 @@ spec:
             - name: "K8S_API_VERIFY_TLS"
               value: "{{ .Values.k8s_api_verify_tls }}"
             - name: "DRYCC_REGISTRY_PROXY_PORT"
-              value: "{{ .Values.global.registry_service_port }}"
+              value: "{{ .Values.global.registry_proxy_port }}"
             - name: "APP_STORAGE"
               value: "{{ .Values.global.storage}}"
             - name: "DRYCC_REGISTRY_LOCATION"
               value: "{{ .Values.global.registry_location }}"
+            - name: "DRYCC_REGISTRY_SECRET_PREFIX"
+              value: "{{ .Values.global.registry_secret_prefix }}"
             - name: "IMAGE_PULL_POLICY"
               value: "{{ .Values.app_pull_policy }}"
             - name: "TZ"

charts/controller/values.yaml

@@ -49,7 +49,9 @@ global:
   # - off-cluster: Use registry outside the Kubernetes cluster (example: dockerhub,quay.io,self-hosted)
   registry_location: "on-cluster"
   # The host port to which registry proxy binds to
-  registry_service_port: 5555
+  registry_proxy_port: 5555
+  # Prefix for the imagepull secret created when using private registry
+  registry_secret_prefix: "private-registry"
   # Role-Based Access Control for Kubernetes >= 1.5
   use_rbac: false
   # Please check `kubernetes.io/ingress.class`

rootfs/api/models/app.py

@@ -2,7 +2,7 @@
 import base64
 from collections import OrderedDict
 from datetime import datetime
-from docker.auth import auth as docker_auth
+from docker import auth as docker_auth
 import functools
 import json
 import logging
@@ -1076,6 +1076,7 @@ def image_pull_secret(self, namespace, registry, image):
         return name
 
     def _get_private_registry_config(self, image, registry=None):
+        name = settings.REGISTRY_SECRET_PREFIX
         if registry:
             # try to get the hostname information
             hostname = registry.get('hostname', None)

rootfs/api/settings/production.py

@@ -341,6 +341,7 @@
 REGISTRY_PORT = os.environ.get('DRYCC_REGISTRY_PROXY_PORT', 5000)
 REGISTRY_URL = '{}:{}'.format(REGISTRY_HOST, REGISTRY_PORT)
 REGISTRY_LOCATION = os.environ.get('DRYCC_REGISTRY_LOCATION', 'on-cluster')
+REGISTRY_SECRET_PREFIX = os.environ.get('DRYCC_REGISTRY_SECRET_PREFIX', 'private-registry')
 
 # logger settings
 LOGGER_HOST = os.environ.get('DRYCC_LOGGER_SERVICE_HOST', '127.0.0.1')

rootfs/api/tests/test_app.py

@@ -621,15 +621,6 @@ def test_get_private_registry_config(self, mock_requests):
         self.assertEqual(name, "private-registry")
         self.assertEqual(create, True)
 
-    @override_settings(REGISTRY_LOCATION="ecr")
-    def test_get_private_registry_config_ecr(self, mock_requests):
-        registry = {}
-        image = "test.com/test/test"
-        docker_config, name, create = App()._get_private_registry_config(image, registry)
-        self.assertEqual(docker_config, None)
-        self.assertEqual(name, "private-registry-ecr")
-        self.assertEqual(create, False)
-
     @override_settings(REGISTRY_LOCATION="off-cluster")
     def test_get_private_registry_config_off_cluster(self, mock_requests):
         registry = {}

rootfs/registry/dockerclient.py

@@ -10,7 +10,7 @@
 
 import docker
 import docker.constants
-from docker.auth import auth
+from docker import auth
 from docker.errors import APIError
 import requests
 
@@ -26,7 +26,7 @@ class DockerClient(object):
 
     def __init__(self):
         timeout = os.environ.get('DOCKER_CLIENT_TIMEOUT', docker.constants.DEFAULT_TIMEOUT_SECONDS)
-        self.client = docker.Client(version='auto', timeout=timeout)
+        self.client = docker.APIClient(version='auto', timeout=timeout)
         self.registry = settings.REGISTRY_HOST + ':' + str(settings.REGISTRY_PORT)
 
     def login(self, repository, creds=None):

rootfs/registry/tests.py

@@ -13,7 +13,7 @@
 from registry.dockerclient import DockerClient
 
 
-@mock.patch('docker.Client')
+@mock.patch('docker.APIClient')
 class DockerClientTest(unittest.TestCase):
     """Test that the client makes appropriate Docker engine API calls."""
 

rootfs/requirements.txt

@@ -5,7 +5,7 @@ django-auth-ldap==1.2.15
 django-cors-middleware==1.3.1
 django-guardian==1.4.9
 djangorestframework==3.6.4
-docker-py==1.10.6
+docker==3.7.2
 gunicorn==19.9.0
 idna==2.6
 jmespath==0.9.3