tests fixes

Author: ofir-amir

skipper/cli.py

@@ -220,8 +220,8 @@ def run(ctx, interactive, name, env, cache, command):
                                                ctx.obj['build_container_tag'],
                                                ctx.obj['git_revision'],
                                                ctx.obj['container_context'],
-                                               ctx.obj['username'],
-                                               ctx.obj['password'],
+                                               ctx.obj.get('username'),
+                                               ctx.obj.get('password'),
                                                cache)
     return runner.run(list(command),
                       fqdn_image=build_container,
@@ -254,8 +254,8 @@ def make(ctx, interactive, name, env, makefile, cache, make_params):
                                                ctx.obj['build_container_tag'],
                                                ctx.obj['git_revision'],
                                                ctx.obj['container_context'],
-                                               ctx.obj['username'],
-                                               ctx.obj['password'],
+                                               ctx.obj.get('username'),
+                                               ctx.obj.get('password'),
                                                cache)
     command = ['make', '-f', makefile] + list(make_params)
     return runner.run(command,
@@ -286,8 +286,8 @@ def shell(ctx, env, name, cache):
                                                ctx.obj['build_container_tag'],
                                                ctx.obj['git_revision'],
                                                ctx.obj['container_context'],
-                                               ctx.obj['username'],
-                                               ctx.obj['password'],
+                                               ctx.obj.get('username'),
+                                               ctx.obj.get('password'),
                                                cache)
     return runner.run(['bash'],
                       fqdn_image=build_container,

skipper/runner.py

@@ -91,31 +91,31 @@ def _run_nested(fqdn_image, environment, command, interactive, name, net, volume
 def handle_volumes_bind_mount(docker_cmd, homedir, volumes, workspace):
     volumes = volumes or []
     volumes.extend(['%(homedir)s/.netrc:%(homedir)s/.netrc:ro' % dict(homedir=homedir),
-                    '%(homedir)s/.gitconfig:%(homedir)s/.gitconfig:ro' % dict(homedir=homedir)])
+                    '%(homedir)s/.gitconfig:%(homedir)s/.gitconfig:ro' % dict(homedir=homedir),
+                    '%(homedir)s/.docker/config.json:%(homedir)s/.docker/config.json:ro' % dict(homedir=homedir)])
 
-    # required for docker login
-    if os.path.exists('%(homedir)s/.docker/config.json' % dict(homedir=homedir)):
-        volumes.append('%(homedir)s/.docker/config.json:%(homedir)s/.docker/config.json:ro' % dict(homedir=homedir))
+    # required for docker login (certificates)
     if os.path.exists('/etc/docker'):
         volumes.append('/etc/docker:/etc/docker:ro')
 
-    # Will fail on Mac
-    if os.path.exists('/var/lib/osmosis'):
-        volumes.append('/var/lib/osmosis:/var/lib/osmosis:rw')
-
     if utils.get_runtime_command() == utils.PODMAN:
         volumes.extend([
             '%(workspace)s:%(workspace)s:rw,shared' % dict(workspace=workspace),
             '%s:/opt/skipper/skipper-entrypoint.sh:rw' % utils.get_extra_file("skipper-entrypoint.sh"),
         ])
         if os.path.exists('/var/run/docker.sock'):
             volumes.append('/var/run/docker.sock:/var/run/docker.sock:rw')
+        if os.path.exists('/var/lib/osmosis'):
+            volumes.append('/var/lib/osmosis:/var/lib/osmosis:rw')
     else:
         volumes.extend([
             '%(workspace)s:%(workspace)s:rw,Z' % dict(workspace=workspace),
             '/var/run/docker.sock:/var/run/docker.sock:Z',
             '%s:/opt/skipper/skipper-entrypoint.sh:Z' % utils.get_extra_file("skipper-entrypoint.sh"),
             ])
+        # Will fail on Mac
+        if os.path.exists('/var/lib/osmosis'):
+            volumes.append('/var/lib/osmosis:/var/lib/osmosis:rw,Z')
 
     for volume in volumes:
         if ":" not in volume:
@@ -144,9 +144,9 @@ def create_vol_localpath_if_needed(volume):
     # that's why we create it as file
     # 2. .docker/config.json - if it is required and doesn't exists we want to create is as file with {} as data
     if ".gitconfig" in host_path and not os.path.exists(host_path):
-        utils.create_path_and_add_data(host_path, data="", is_file=True)
+        utils.create_path_and_add_data(full_path=host_path, data="", is_file=True)
     elif "docker/config.json" in host_path and not os.path.exists(host_path):
-        utils.create_path_and_add_data(host_path, data="{}", is_file=True)
+        utils.create_path_and_add_data(full_path=host_path, data="{}", is_file=True)
     elif not os.path.exists(host_path):
         # If the local directory of a mount entry doesn't exist, docker will by
         # default create a directory in that path. Docker runs in systemd context,

skipper/utils.py

@@ -119,8 +119,7 @@ def get_image_digest(registry, image, tag, username, password):
 def delete_image_from_registry(registry, image, tag, username, password):
     digest = get_image_digest(registry, image, tag, username, password)
     url = MANIFEST_URL % dict(registry=registry, image=image, reference=digest)
-    headers = {"Accept": "application/vnd.docker.distribution.manifest.v2+json"}
-    response = requests.delete(url=url, headers=headers, verify=False, auth=HttpBearerAuth(username, password))
+    response = requests.delete(url=url, verify=False, auth=HttpBearerAuth(username, password))
     if not response.ok:
         raise Exception(response.content)