occystrap 0.3.0__tar.gz → 0.4.0__tar.gz

{occystrap-0.3.0 → occystrap-0.4.0}/.github/workflows/functional-tests.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - name: Remove previous unfinished runs
         uses: n1hility/cancel-previous-runs@v2
-        with: 
+        with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get rid of sudo error messages
@@ -31,8 +31,6 @@ jobs:
 
       - name: Install minimum dependencies
         run: |
-          echo 'Acquire::http::Proxy "http://192.168.1.50:8000";' > /tmp/00proxy
-          sudo mv /tmp/00proxy /etc/apt/apt.conf.d/
           sudo apt-get update
           sudo apt-get dist-upgrade -y
           sudo apt-get install -y python3 python3-dev python3-pip python3-wheel apparmor docker.io runc
@@ -53,7 +51,7 @@ jobs:
 
       - name: Build occystrap wheel and install it
         run: |
-          cd /srv/github/_work/occystrap/occystrap/occystrap
+          cd /srv/ci/runner/_work/occystrap/occystrap/occystrap
           rm -f dist/*
           python3 setup.py sdist bdist_wheel
           sudo pip3 install dist/occystrap*.whl
@@ -61,18 +59,18 @@ jobs:
       - name: Run a local docker registry to talk to, and populate it with test data
         run: |
           docker run -d -p 5000:5000 --restart=always --name registry registry:2
-          cd /srv/github/_work/occystrap/occystrap/occystrap/deploy/occystrap_ci/testdata
+          cd /srv/ci/runner/_work/occystrap/occystrap/occystrap/deploy/occystrap_ci/testdata
 
           for img in deletion_layers; do
             cd $img
             docker build -t localhost:5000/occystrap_$img:latest .
             docker push localhost:5000/occystrap_$img:latest
-            cd /srv/github/_work/occystrap/occystrap/occystrap/deploy/occystrap_ci/testdata
+            cd /srv/ci/runner/_work/occystrap/occystrap/occystrap/deploy/occystrap_ci/testdata
           done
 
       - name: Run functional tests
         run: |
-          cd /srv/github/_work/occystrap/occystrap/occystrap/deploy
+          cd /srv/ci/runner/_work/occystrap/occystrap/occystrap/deploy
           sudo pip3 install -r requirements.txt
           sudo pip3 install -r test-requirements.txt
 

{occystrap-0.3.0 → occystrap-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: occystrap
-Version: 0.3.0
+Version: 0.4.0
 Summary: occystrap: docker and OCI container tools
 Home-page: https://github.com/shakenfist/occystrap
 Author: Michael Still

{occystrap-0.3.0 → occystrap-0.4.0}/deploy/ansible/ci.yml

@@ -133,15 +133,6 @@
     source_path: "/home/jenkins/src/occystrap/"
 
   tasks:
-    - name: Use CI package cache to speed things up
-      copy:
-        content: |
-          Acquire::http::Proxy "http://192.168.1.50:8000";
-        dest: /etc/apt/apt.conf.d/00proxy
-        owner: root
-        group: root
-        mode: u=r,g=r,o=r
-
     - name: Install minimum dependencies
       apt:
         name:

{occystrap-0.3.0 → occystrap-0.4.0}/occystrap/docker_registry.py

@@ -5,6 +5,9 @@
 # format, noting that the response format you get back varies based on what you have
 # in your accept header for the request.
 
+# https://github.com/opencontainers/image-spec/blob/main/media-types.md documents
+# the new OCI mime types.
+
 import hashlib
 import io
 import logging
@@ -86,7 +89,9 @@ class Image(object):
         if r.headers['Content-Type'] == 'application/vnd.docker.distribution.manifest.v2+json':
             manifest = r.json()
             config_digest = manifest['config']['digest']
-        elif r.headers['Content-Type'] == 'application/vnd.docker.distribution.manifest.list.v2+json':
+        elif r.headers['Content-Type'] in [
+                'application/vnd.docker.distribution.manifest.list.v2+json',
+                'application/vnd.oci.image.index.v1+json']:
             for m in r.json()['manifests']:
                 if 'variant' in m['platform']:
                     LOG.info('Found manifest for %s on %s %s'
@@ -109,7 +114,8 @@ class Image(object):
                             'image': self.image,
                             'tag': m['digest']
                         },
-                        headers={'Accept': ('application/vnd.docker.distribution.manifest.v2+json')})
+                        headers={'Accept': ('application/vnd.docker.distribution.manifest.v2+json, '
+                                            'application/vnd.oci.image.manifest.v1+json')})
                     manifest = r.json()
                     config_digest = manifest['config']['digest']
 

{occystrap-0.3.0 → occystrap-0.4.0}/occystrap.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: occystrap
-Version: 0.3.0
+Version: 0.4.0
 Summary: occystrap: docker and OCI container tools
 Home-page: https://github.com/shakenfist/occystrap
 Author: Michael Still

occystrap-0.4.0/occystrap.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "c1cb09a", "is_release": true}

occystrap-0.3.0/occystrap.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "27e37dc", "is_release": true}