Merge pull request #416 from yuvipanda/upgrade-otter

Fix image build script + upgrade otter

deployer/build.py

@@ -51,11 +51,12 @@ def image_exists(image_name):
 
     return result.returncode == 0
 
+
 def build_image(image_repo):
     """
     Build & push image in images/user if needed
     """
-    tag = last_modified_commit(os.path.join(HERE, "images/user"))
+    tag = last_modified_commit(os.path.join(HERE, "../images/user"))
     image_name = f"{image_repo}:{tag}"
 
     if image_exists(image_name):

deployer/hub.py

@@ -31,6 +31,7 @@ def __init__(self, spec):
         ]
 
     def build_image(self):
+        self.ensure_docker_credhelpers()
         build_image(self.spec['image_repo'])
 
     @contextmanager
@@ -42,6 +43,40 @@ def auth(self):
         else:
             raise ValueError(f'Provider {self.spec["provider"]} not supported')
 
+    def ensure_docker_credhelpers(self):
+        """
+        Setup credHelper for current hub's image registry.
+
+        Most image registries (like ECR, GCP Artifact registry, etc) use
+        a docker credHelper (https://docs.docker.com/engine/reference/commandline/login/#credential-helpers)
+        to authenticate, rather than a username & password. This requires an
+        entry per registry in ~/.docker/config.json.
+
+        This method ensures the appropriate credential helper is present
+        """
+        image_name = self.spec['image_repo']
+        registry = image_name.split('/')[0]
+
+        helper = None
+        # pkg.dev is used by Google Cloud Artifact registry
+        if registry.endswith('pkg.dev'):
+            helper = 'gcloud'
+
+        if helper is not None:
+            dockercfg_path = os.path.expanduser('~/.docker/config.json')
+            try:
+                with open(dockercfg_path) as f:
+                    config = json.load(f)
+            except FileNotFoundError:
+                config = {}
+
+            helpers = config.get('credHelpers', {})
+            if helpers.get(registry) != helper:
+                helpers[registry] = helper
+                config['credHelpers'] = helpers
+                with open(dockercfg_path, 'w') as f:
+                    json.dump(config, f, indent=4)
+
 
     def auth_kubeconfig(self):
         """

hub-templates/basehub/values.yaml

@@ -106,7 +106,7 @@ jupyterhub:
       hub.jupyter.org/node-purpose: user
     image:
       name: set_automatically_by_automation
-      tag: 1b83c4f
+      tag: 524cf58
     storage:
       type: static
       static:

images/user/environment.yml

@@ -44,7 +44,7 @@ dependencies:
     - jupyter-rsession-proxy==1.2
     - jupyter-tree-download==1.0.1
     - ipywidgets==7.5.1
-    - otter-grader==1.1.3
+    - otter-grader==2.1.7
 
     - datascience
     - geojson