Add support for "Builder: oci-import" in diff-pr #13968
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This currently relies on a Example Diff (#13950):diff --git a/_bashbrew-cat b/_bashbrew-cat
dissimilarity index 93%
index cd7187b..5724c83 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -?,? +1,77 @@
+Maintainers: Tomáš Virtus <tomas.virtus@canonical.com> (@woky), Tianon Gravi <tianon@debian.org> (@tianon), Michael Hudson-Doyle <michael.hudson@ubuntu.com> (@mwhudson)
+GitRepo: https://git.launchpad.net/cloud-images/+oci/ubuntu-base
+GitCommit: 83a88668100df57b36fe88a54009a93cda93ceb1
+File: index.json
+Builder: oci-import
+
+Tags: 18.04, bionic-20230126, bionic
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+Directory: oci
+amd64-GitCommit: 4dd8c0973fccaf8699bac0a666f007b9d05c95fd
+amd64-GitFetch: refs/tags/dist-bionic-amd64-20230126
+arm32v7-GitCommit: 05dec6c92df08be939ff9cf56af47cb6b8573377
+arm32v7-GitFetch: refs/tags/dist-bionic-arm32v7-20230126
+arm64v8-GitCommit: d9ffb2e569ccbb6a58e8fce586e0ae6c1a5fea44
+arm64v8-GitFetch: refs/tags/dist-bionic-arm64v8-20230126
+i386-GitCommit: ab92ac32e100c9d93794f963adf4959b8bf831a3
+i386-GitFetch: refs/tags/dist-bionic-i386-20230126
+ppc64le-GitCommit: 0524daa8c593ad5af2f128c0436b2084ecad9b2a
+ppc64le-GitFetch: refs/tags/dist-bionic-ppc64le-20230126
+s390x-GitCommit: d4936be051d9ec0c6ba8043f8016117bf08b02d4
+s390x-GitFetch: refs/tags/dist-bionic-s390x-20230126
+
+Tags: 20.04, focal-20230126, focal
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+Directory: oci
+amd64-GitCommit: 51f5b41f106b8b1e926fcfd2382813801c571233
+amd64-GitFetch: refs/tags/dist-focal-amd64-20230126
+arm32v7-GitCommit: da5d23437a37b5120c76d71d436c8effdb4677c0
+arm32v7-GitFetch: refs/tags/dist-focal-arm32v7-20230126
+arm64v8-GitCommit: 4d9885922479ec41460ac912af03787a944e53af
+arm64v8-GitFetch: refs/tags/dist-focal-arm64v8-20230126
+ppc64le-GitCommit: 187ae5c5d5c627944fc79f8d829ee057a3238f97
+ppc64le-GitFetch: refs/tags/dist-focal-ppc64le-20230126
+s390x-GitCommit: 344179c85e33d6671b4eb09a812dfa3dd0c50173
+s390x-GitFetch: refs/tags/dist-focal-s390x-20230126
+
+Tags: 22.04, jammy-20230126, jammy, latest
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+Directory: oci
+amd64-GitCommit: c59419b8a85cb1d938e73e83af8f8e6ff4110444
+amd64-GitFetch: refs/tags/dist-jammy-amd64-20230126
+arm32v7-GitCommit: 749c1ce830611a34de60af692e95b24304e3940d
+arm32v7-GitFetch: refs/tags/dist-jammy-arm32v7-20230126
+arm64v8-GitCommit: 331413876d90316fa4756fcdd4a1379fd12a65b4
+arm64v8-GitFetch: refs/tags/dist-jammy-arm64v8-20230126
+ppc64le-GitCommit: b2ec7435265bb1f582be647d6e4fc8b49bbc99c0
+ppc64le-GitFetch: refs/tags/dist-jammy-ppc64le-20230126
+s390x-GitCommit: 23e6cd3536d0f63292799c8b56a53efd6ccc1161
+s390x-GitFetch: refs/tags/dist-jammy-s390x-20230126
+
+Tags: 22.10, kinetic-20230126, kinetic, rolling
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+Directory: oci
+amd64-GitCommit: a806765a4285f4a19789ade917f91d2b878955d8
+amd64-GitFetch: refs/tags/dist-kinetic-amd64-20230126
+arm32v7-GitCommit: f4babcd0bcf63c1f4df6c6c908ca0551d039b6ff
+arm32v7-GitFetch: refs/tags/dist-kinetic-arm32v7-20230126
+arm64v8-GitCommit: 1fb846bdd6806009d4a9e29f8a08779934ecde49
+arm64v8-GitFetch: refs/tags/dist-kinetic-arm64v8-20230126
+ppc64le-GitCommit: c9ac87ff916919b2192628f9f3ea5b5257c055fa
+ppc64le-GitFetch: refs/tags/dist-kinetic-ppc64le-20230126
+s390x-GitCommit: ae53d315f94fd8d80340bbdabc51cabc250112d3
+s390x-GitFetch: refs/tags/dist-kinetic-s390x-20230126
+
+Tags: 23.04, lunar-20230124.1, lunar, devel
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+Directory: oci
+amd64-GitCommit: 407671a226ede7401c411693e77fb4b8bf0adf75
+amd64-GitFetch: refs/tags/dist-lunar-amd64-20230124.1
+arm32v7-GitCommit: c171ab00df277c914ee204eb6f3e606531c96cc7
+arm32v7-GitFetch: refs/tags/dist-lunar-arm32v7-20230124.1
+arm64v8-GitCommit: d6b38a4498f731b47b397d2577c260e5e008aaab
+arm64v8-GitFetch: refs/tags/dist-lunar-arm64v8-20230124.1
+ppc64le-GitCommit: f769ef4a8e68765641a9a48fa8b36c53fac7ced5
+ppc64le-GitFetch: refs/tags/dist-lunar-ppc64le-20230124.1
+s390x-GitCommit: 5c2bbbc8cb1b4259eee70b4b288e2042aaa3ff91
+s390x-GitFetch: refs/tags/dist-lunar-s390x-20230124.1
diff --git a/_bashbrew-list b/_bashbrew-list
index aef51e1..eb39cc1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,24 +1,18 @@
-ubuntu:14.04
-ubuntu:16.04
ubuntu:18.04
ubuntu:20.04
ubuntu:22.04
ubuntu:22.10
ubuntu:23.04
ubuntu:bionic
-ubuntu:bionic-20221215
+ubuntu:bionic-20230126
ubuntu:devel
ubuntu:focal
-ubuntu:focal-20221130
+ubuntu:focal-20230126
ubuntu:jammy
-ubuntu:jammy-20221130
+ubuntu:jammy-20230126
ubuntu:kinetic
-ubuntu:kinetic-20221130
+ubuntu:kinetic-20230126
ubuntu:latest
ubuntu:lunar
-ubuntu:lunar-20221216
+ubuntu:lunar-20230124.1
ubuntu:rolling
-ubuntu:trusty
-ubuntu:trusty-20191217
-ubuntu:xenial
-ubuntu:xenial-20210804
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 0aecbb0..efacea5 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,5 +1,3 @@
-ubuntu:trusty
-ubuntu:xenial
ubuntu:bionic
ubuntu:focal
ubuntu:latest
diff --git a/ubuntu_14.04/.dockerignore b/ubuntu_14.04/.dockerignore
deleted file mode 100644
index 6b8710a..0000000
diff --git a/ubuntu_14.04/Dockerfile b/ubuntu_14.04/Dockerfile
deleted file mode 100644
index 979445b..0000000
diff --git a/ubuntu_14.04/build-info.txt b/ubuntu_14.04/build-info.txt
deleted file mode 100644
index f534e5c..0000000
diff --git a/ubuntu_14.04/ubuntu-trusty-core-cloudimg-amd64-root.tar.gz b/ubuntu_14.04/ubuntu-trusty-core-cloudimg-amd64-root.tar.gz
deleted file mode 100644
index f139e90..0000000
diff --git a/ubuntu_14.04/ubuntu-trusty-core-cloudimg-amd64-root.tar.gz 'tar -t' b/ubuntu_14.04/ubuntu-trusty-core-cloudimg-amd64-root.tar.gz 'tar -t'
deleted file mode 100644
index 2b55f14..0000000
diff --git a/ubuntu_14.04/ubuntu-trusty-core-cloudimg-amd64.manifest b/ubuntu_14.04/ubuntu-trusty-core-cloudimg-amd64.manifest
deleted file mode 100644
index c92691d..0000000
diff --git a/ubuntu_16.04/.dockerignore b/ubuntu_16.04/.dockerignore
deleted file mode 100644
index 6b8710a..0000000
diff --git a/ubuntu_16.04/Dockerfile b/ubuntu_16.04/Dockerfile
deleted file mode 100644
index c809159..0000000
diff --git a/ubuntu_16.04/build-info.txt b/ubuntu_16.04/build-info.txt
deleted file mode 100644
index 190b82e..0000000
diff --git a/ubuntu_16.04/ubuntu-xenial-core-cloudimg-amd64-root.tar.gz b/ubuntu_16.04/ubuntu-xenial-core-cloudimg-amd64-root.tar.gz
deleted file mode 100644
index ddf884e..0000000
diff --git a/ubuntu_16.04/ubuntu-xenial-core-cloudimg-amd64-root.tar.gz 'tar -t' b/ubuntu_16.04/ubuntu-xenial-core-cloudimg-amd64-root.tar.gz 'tar -t'
deleted file mode 100644
index 07df4d9..0000000
diff --git a/ubuntu_16.04/ubuntu-xenial-core-cloudimg-amd64.manifest b/ubuntu_16.04/ubuntu-xenial-core-cloudimg-amd64.manifest
deleted file mode 100644
index 8e9ed97..0000000
diff --git a/ubuntu_18.04/.dockerignore b/ubuntu_18.04/.dockerignore
deleted file mode 100644
index 6b8710a..0000000
diff --git a/ubuntu_18.04/Dockerfile b/ubuntu_18.04/Dockerfile
deleted file mode 100644
index 2075b60..0000000
diff --git a/ubuntu_18.04/blobs/sha256/0b0aab2bb85da9e3168407368464cb15f828eda8860eefb4c74a57dea2f139c7 b/ubuntu_18.04/blobs/sha256/0b0aab2bb85da9e3168407368464cb15f828eda8860eefb4c74a57dea2f139c7
new file mode 100644
index 0000000..f568449
--- /dev/null
+++ b/ubuntu_18.04/blobs/sha256/0b0aab2bb85da9e3168407368464cb15f828eda8860eefb4c74a57dea2f139c7
@@ -0,0 +1,16 @@
+{
+ "config": {
+ "digest": "sha256:5d2df19066aca89df8e5317544a1cb599dc657830184762ff6fdefaaf708db65",
+ "mediaType": "application/vnd.docker.container.image.v1+json",
+ "size": 2297
+ },
+ "layers": [
+ {
+ "digest": "sha256:72d9f18d70f395ff9bfae4d193077ccea3ca583e3da3dd66f5c84520c0100727",
+ "mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
+ "size": 25688613
+ }
+ ],
+ "mediaType": "application/vnd.oci.image.manifest.v1+json",
+ "schemaVersion": 2
+}
diff --git a/ubuntu_18.04/blobs/sha256/5d2df19066aca89df8e5317544a1cb599dc657830184762ff6fdefaaf708db65 b/ubuntu_18.04/blobs/sha256/5d2df19066aca89df8e5317544a1cb599dc657830184762ff6fdefaaf708db65
new file mode 100644
index 0000000..1b8b8e5
--- /dev/null
+++ b/ubuntu_18.04/blobs/sha256/5d2df19066aca89df8e5317544a1cb599dc657830184762ff6fdefaaf708db65
@@ -0,0 +1,99 @@
+{
+ "architecture": "amd64",
+ "config": {
+ "AttachStderr": false,
+ "AttachStdin": false,
+ "AttachStdout": false,
+ "Cmd": [
+ "/bin/bash"
+ ],
+ "Domainname": "",
+ "Entrypoint": null,
+ "Env": [
+ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ ],
+ "Hostname": "",
+ "Image": "sha256:8f1c561a3c249f3c3a0612c551b99309eca5423c20208947260d096527c6a108",
+ "Labels": {
+ "org.opencontainers.image.ref.name": "ubuntu",
+ "org.opencontainers.image.version": "18.04"
+ },
+ "OnBuild": null,
+ "OpenStdin": false,
+ "StdinOnce": false,
+ "Tty": false,
+ "User": "",
+ "Volumes": null,
+ "WorkingDir": ""
+ },
+ "container": "c3de9a977075ecdaa59e911a35b9e722bef84c25567a3a0931bea346b24b93d6",
+ "container_config": {
+ "AttachStderr": false,
+ "AttachStdin": false,
+ "AttachStdout": false,
+ "Cmd": [
+ "/bin/sh",
+ "-c",
+ "#(nop) ",
+ "CMD [\"/bin/bash\"]"
+ ],
+ "Domainname": "",
+ "Entrypoint": null,
+ "Env": [
+ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ ],
+ "Hostname": "c3de9a977075",
+ "Image": "sha256:8f1c561a3c249f3c3a0612c551b99309eca5423c20208947260d096527c6a108",
+ "Labels": {
+ "org.opencontainers.image.ref.name": "ubuntu",
+ "org.opencontainers.image.version": "18.04"
+ },
+ "OnBuild": null,
+ "OpenStdin": false,
+ "StdinOnce": false,
+ "Tty": false,
+ "User": "",
+ "Volumes": null,
+ "WorkingDir": ""
+ },
+ "created": "2023-01-26T10:03:05.221824871Z",
+ "docker_version": "20.10.12",
+ "history": [
+ {
+ "created": "2023-01-26T10:03:03.123412846Z",
+ "created_by": "/bin/sh -c #(nop) ARG RELEASE",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T10:03:03.179445667Z",
+ "created_by": "/bin/sh -c #(nop) ARG LAUNCHPAD_BUILD_ARCH",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T10:03:03.238578224Z",
+ "created_by": "/bin/sh -c #(nop) LABEL org.opencontainers.image.ref.name=ubuntu",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T10:03:03.303267113Z",
+ "created_by": "/bin/sh -c #(nop) LABEL org.opencontainers.image.version=18.04",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T10:03:04.9904471Z",
+ "created_by": "/bin/sh -c #(nop) ADD file:365c129e10f7ef1594e8086543b45f524313e36dd6a25b68f4da542a09491f04 in / "
+ },
+ {
+ "created": "2023-01-26T10:03:05.221824871Z",
+ "created_by": "/bin/sh -c #(nop) CMD [\"/bin/bash\"]",
+ "empty_layer": true
+ }
+ ],
+ "os": "linux",
+ "rootfs": {
+ "diff_ids": [
+ "sha256:475a54c2a93de61ab1a000184b41b5c5370eef3842486f6c185cd9a001ff1a92"
+ ],
+ "type": "layers"
+ }
+}
diff --git a/ubuntu_18.04/ubuntu-bionic-oci-amd64-root.tar.gz 'tar -t' b/ubuntu_18.04/blobs/sha256/72d9f18d70f395ff9bfae4d193077ccea3ca583e3da3dd66f5c84520c0100727 'tar -t'
similarity index 99%
rename from ubuntu_18.04/ubuntu-bionic-oci-amd64-root.tar.gz 'tar -t'
rename to ubuntu_18.04/blobs/sha256/72d9f18d70f395ff9bfae4d193077ccea3ca583e3da3dd66f5c84520c0100727 'tar -t'
index fa2692e..867d38b 100644
--- a/ubuntu_18.04/ubuntu-bionic-oci-amd64-root.tar.gz 'tar -t'
+++ b/ubuntu_18.04/blobs/sha256/72d9f18d70f395ff9bfae4d193077ccea3ca583e3da3dd66f5c84520c0100727 'tar -t'
@@ -115,6 +115,8 @@ etc/apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg
etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
etc/bash.bashrc
etc/bindresvport.blacklist
+etc/cloud/
+etc/cloud/build.info
etc/cron.daily/
etc/cron.daily/apt-compat
etc/cron.daily/dpkg
diff --git a/ubuntu_18.04/build-info.txt b/ubuntu_18.04/build-info.txt
deleted file mode 100644
index c9e9e37..0000000
diff --git a/ubuntu_18.04/index.json b/ubuntu_18.04/index.json
new file mode 100644
index 0000000..97e5813
--- /dev/null
+++ b/ubuntu_18.04/index.json
@@ -0,0 +1,10 @@
+{
+ "manifests": [
+ {
+ "digest": "sha256:0b0aab2bb85da9e3168407368464cb15f828eda8860eefb4c74a57dea2f139c7",
+ "mediaType": "application/vnd.oci.image.manifest.v1+json",
+ "size": 436
+ }
+ ],
+ "schemaVersion": 2
+}
diff --git a/ubuntu_18.04/ubuntu-bionic-oci-amd64-root.manifest b/ubuntu_18.04/ubuntu-bionic-oci-amd64-root.manifest
deleted file mode 100644
index 22c3c9d..0000000
diff --git a/ubuntu_18.04/ubuntu-bionic-oci-amd64-root.tar.gz b/ubuntu_18.04/ubuntu-bionic-oci-amd64-root.tar.gz
deleted file mode 100644
index 043e185..0000000
diff --git a/ubuntu_20.04/.dockerignore b/ubuntu_20.04/.dockerignore
deleted file mode 100644
index 6b8710a..0000000
diff --git a/ubuntu_20.04/Dockerfile b/ubuntu_20.04/Dockerfile
deleted file mode 100644
index 9826afc..0000000
diff --git a/ubuntu_20.04/ubuntu-focal-oci-amd64-root.tar.gz 'tar -t' b/ubuntu_20.04/blobs/sha256/bdec8b63443ac80dc7fdf49c2b5bbe08191e0f5fda5f1f5d6b5f25263cfa2c47 'tar -t'
similarity index 99%
rename from ubuntu_20.04/ubuntu-focal-oci-amd64-root.tar.gz 'tar -t'
rename to ubuntu_20.04/blobs/sha256/bdec8b63443ac80dc7fdf49c2b5bbe08191e0f5fda5f1f5d6b5f25263cfa2c47 'tar -t'
index 09b8090..4fd94f3 100644
--- a/ubuntu_20.04/ubuntu-focal-oci-amd64-root.tar.gz 'tar -t'
+++ b/ubuntu_20.04/blobs/sha256/bdec8b63443ac80dc7fdf49c2b5bbe08191e0f5fda5f1f5d6b5f25263cfa2c47 'tar -t'
@@ -29,6 +29,8 @@ etc/apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg
etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
etc/bash.bashrc
etc/bindresvport.blacklist
+etc/cloud/
+etc/cloud/build.info
etc/cron.d/
etc/cron.daily/
etc/cron.daily/apt-compat
diff --git a/ubuntu_20.04/blobs/sha256/d5d4814ffb155d588f10ec8926d9e1cd09b6d41a3110d2f42959e2fc37f6d0b4 b/ubuntu_20.04/blobs/sha256/d5d4814ffb155d588f10ec8926d9e1cd09b6d41a3110d2f42959e2fc37f6d0b4
new file mode 100644
index 0000000..dc937c7
--- /dev/null
+++ b/ubuntu_20.04/blobs/sha256/d5d4814ffb155d588f10ec8926d9e1cd09b6d41a3110d2f42959e2fc37f6d0b4
@@ -0,0 +1,16 @@
+{
+ "config": {
+ "digest": "sha256:f32fe8df6a4c91a6bfe1fae9ffa5a05bac157d0edd78571d34c3c784985d95f7",
+ "mediaType": "application/vnd.docker.container.image.v1+json",
+ "size": 2299
+ },
+ "layers": [
+ {
+ "digest": "sha256:bdec8b63443ac80dc7fdf49c2b5bbe08191e0f5fda5f1f5d6b5f25263cfa2c47",
+ "mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
+ "size": 27503418
+ }
+ ],
+ "mediaType": "application/vnd.oci.image.manifest.v1+json",
+ "schemaVersion": 2
+}
diff --git a/ubuntu_20.04/blobs/sha256/f32fe8df6a4c91a6bfe1fae9ffa5a05bac157d0edd78571d34c3c784985d95f7 b/ubuntu_20.04/blobs/sha256/f32fe8df6a4c91a6bfe1fae9ffa5a05bac157d0edd78571d34c3c784985d95f7
new file mode 100644
index 0000000..5e4fd16
--- /dev/null
+++ b/ubuntu_20.04/blobs/sha256/f32fe8df6a4c91a6bfe1fae9ffa5a05bac157d0edd78571d34c3c784985d95f7
@@ -0,0 +1,99 @@
+{
+ "architecture": "amd64",
+ "config": {
+ "AttachStderr": false,
+ "AttachStdin": false,
+ "AttachStdout": false,
+ "Cmd": [
+ "/bin/bash"
+ ],
+ "Domainname": "",
+ "Entrypoint": null,
+ "Env": [
+ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ ],
+ "Hostname": "",
+ "Image": "sha256:36b459511f9dbb53f2c0e770e63ced104fec1ab1f4b913387287b5af35d2998c",
+ "Labels": {
+ "org.opencontainers.image.ref.name": "ubuntu",
+ "org.opencontainers.image.version": "20.04"
+ },
+ "OnBuild": null,
+ "OpenStdin": false,
+ "StdinOnce": false,
+ "Tty": false,
+ "User": "",
+ "Volumes": null,
+ "WorkingDir": ""
+ },
+ "container": "56f659fbc8045121099b43fe730ae957f52ddc6b1795cddf3afd03d22e2fe293",
+ "container_config": {
+ "AttachStderr": false,
+ "AttachStdin": false,
+ "AttachStdout": false,
+ "Cmd": [
+ "/bin/sh",
+ "-c",
+ "#(nop) ",
+ "CMD [\"/bin/bash\"]"
+ ],
+ "Domainname": "",
+ "Entrypoint": null,
+ "Env": [
+ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ ],
+ "Hostname": "56f659fbc804",
+ "Image": "sha256:36b459511f9dbb53f2c0e770e63ced104fec1ab1f4b913387287b5af35d2998c",
+ "Labels": {
+ "org.opencontainers.image.ref.name": "ubuntu",
+ "org.opencontainers.image.version": "20.04"
+ },
+ "OnBuild": null,
+ "OpenStdin": false,
+ "StdinOnce": false,
+ "Tty": false,
+ "User": "",
+ "Volumes": null,
+ "WorkingDir": ""
+ },
+ "created": "2023-01-26T13:19:57.976088931Z",
+ "docker_version": "20.10.12",
+ "history": [
+ {
+ "created": "2023-01-26T13:19:55.524922848Z",
+ "created_by": "/bin/sh -c #(nop) ARG RELEASE",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T13:19:55.620103398Z",
+ "created_by": "/bin/sh -c #(nop) ARG LAUNCHPAD_BUILD_ARCH",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T13:19:55.735457902Z",
+ "created_by": "/bin/sh -c #(nop) LABEL org.opencontainers.image.ref.name=ubuntu",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T13:19:55.803723269Z",
+ "created_by": "/bin/sh -c #(nop) LABEL org.opencontainers.image.version=20.04",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T13:19:57.695790187Z",
+ "created_by": "/bin/sh -c #(nop) ADD file:8b180a9b4497de0c6e131d6b48cf5c69a885379e63033ab9639d1655991e626c in / "
+ },
+ {
+ "created": "2023-01-26T13:19:57.976088931Z",
+ "created_by": "/bin/sh -c #(nop) CMD [\"/bin/bash\"]",
+ "empty_layer": true
+ }
+ ],
+ "os": "linux",
+ "rootfs": {
+ "diff_ids": [
+ "sha256:d543b8cad89e3428ac8852a13cb2dbfaf55b1e10fd95a9753e51faf393d60e81"
+ ],
+ "type": "layers"
+ }
+}
diff --git a/ubuntu_20.04/build-info.txt b/ubuntu_20.04/build-info.txt
deleted file mode 100644
index 918abbc..0000000
diff --git a/ubuntu_20.04/index.json b/ubuntu_20.04/index.json
new file mode 100644
index 0000000..604bda3
--- /dev/null
+++ b/ubuntu_20.04/index.json
@@ -0,0 +1,10 @@
+{
+ "manifests": [
+ {
+ "digest": "sha256:d5d4814ffb155d588f10ec8926d9e1cd09b6d41a3110d2f42959e2fc37f6d0b4",
+ "mediaType": "application/vnd.oci.image.manifest.v1+json",
+ "size": 436
+ }
+ ],
+ "schemaVersion": 2
+}
diff --git a/ubuntu_20.04/ubuntu-focal-oci-amd64-root.manifest b/ubuntu_20.04/ubuntu-focal-oci-amd64-root.manifest
deleted file mode 100644
index c8739ac..0000000
diff --git a/ubuntu_20.04/ubuntu-focal-oci-amd64-root.tar.gz b/ubuntu_20.04/ubuntu-focal-oci-amd64-root.tar.gz
deleted file mode 100644
index 88bae17..0000000
diff --git a/ubuntu_22.04/.dockerignore b/ubuntu_22.04/.dockerignore
deleted file mode 100644
index 6b8710a..0000000
diff --git a/ubuntu_22.04/Dockerfile b/ubuntu_22.04/Dockerfile
deleted file mode 100644
index 11db501..0000000
diff --git a/ubuntu_22.04/blobs/sha256/58db3edaf2be6e80f628796355b1bdeaf8bea1692b402f48b7e7b8d1ff100b02 b/ubuntu_22.04/blobs/sha256/58db3edaf2be6e80f628796355b1bdeaf8bea1692b402f48b7e7b8d1ff100b02
new file mode 100644
index 0000000..7a21f91
--- /dev/null
+++ b/ubuntu_22.04/blobs/sha256/58db3edaf2be6e80f628796355b1bdeaf8bea1692b402f48b7e7b8d1ff100b02
@@ -0,0 +1,99 @@
+{
+ "architecture": "amd64",
+ "config": {
+ "AttachStderr": false,
+ "AttachStdin": false,
+ "AttachStdout": false,
+ "Cmd": [
+ "/bin/bash"
+ ],
+ "Domainname": "",
+ "Entrypoint": null,
+ "Env": [
+ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ ],
+ "Hostname": "",
+ "Image": "sha256:269190441c1f8398e85a287ba6ac5568574f55bfcae7fb99bd253afad8cd8e69",
+ "Labels": {
+ "org.opencontainers.image.ref.name": "ubuntu",
+ "org.opencontainers.image.version": "22.04"
+ },
+ "OnBuild": null,
+ "OpenStdin": false,
+ "StdinOnce": false,
+ "Tty": false,
+ "User": "",
+ "Volumes": null,
+ "WorkingDir": ""
+ },
+ "container": "6be7983e643200aa82c27e883bf03ae871243571f93a39f39d11dd3c79c96611",
+ "container_config": {
+ "AttachStderr": false,
+ "AttachStdin": false,
+ "AttachStdout": false,
+ "Cmd": [
+ "/bin/sh",
+ "-c",
+ "#(nop) ",
+ "CMD [\"/bin/bash\"]"
+ ],
+ "Domainname": "",
+ "Entrypoint": null,
+ "Env": [
+ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ ],
+ "Hostname": "6be7983e6432",
+ "Image": "sha256:269190441c1f8398e85a287ba6ac5568574f55bfcae7fb99bd253afad8cd8e69",
+ "Labels": {
+ "org.opencontainers.image.ref.name": "ubuntu",
+ "org.opencontainers.image.version": "22.04"
+ },
+ "OnBuild": null,
+ "OpenStdin": false,
+ "StdinOnce": false,
+ "Tty": false,
+ "User": "",
+ "Volumes": null,
+ "WorkingDir": ""
+ },
+ "created": "2023-01-26T04:58:02.385638665Z",
+ "docker_version": "20.10.12",
+ "history": [
+ {
+ "created": "2023-01-26T04:57:59.893830181Z",
+ "created_by": "/bin/sh -c #(nop) ARG RELEASE",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T04:57:59.959936538Z",
+ "created_by": "/bin/sh -c #(nop) ARG LAUNCHPAD_BUILD_ARCH",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T04:58:00.031088326Z",
+ "created_by": "/bin/sh -c #(nop) LABEL org.opencontainers.image.ref.name=ubuntu",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T04:58:00.098806406Z",
+ "created_by": "/bin/sh -c #(nop) LABEL org.opencontainers.image.version=22.04",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T04:58:02.097080644Z",
+ "created_by": "/bin/sh -c #(nop) ADD file:18e71f049606f6339ce7a995839623f50e6ec6474bfd0a3a7ca799db726f47f6 in / "
+ },
+ {
+ "created": "2023-01-26T04:58:02.385638665Z",
+ "created_by": "/bin/sh -c #(nop) CMD [\"/bin/bash\"]",
+ "empty_layer": true
+ }
+ ],
+ "os": "linux",
+ "rootfs": {
+ "diff_ids": [
+ "sha256:c5ff2d88f67954bdcf1cfdd46fe3d683858d69c2cadd6660812edfc83726c654"
+ ],
+ "type": "layers"
+ }
+}
diff --git a/ubuntu_22.04/ubuntu-jammy-oci-amd64-root.tar.gz 'tar -t' b/ubuntu_22.04/blobs/sha256/677076032cca0a2362d25cf3660072e738d1b96fe860409a33ce901d695d7ee8 'tar -t'
similarity index 99%
rename from ubuntu_22.04/ubuntu-jammy-oci-amd64-root.tar.gz 'tar -t'
rename to ubuntu_22.04/blobs/sha256/677076032cca0a2362d25cf3660072e738d1b96fe860409a33ce901d695d7ee8 'tar -t'
index 8c391df..bdef454 100644
--- a/ubuntu_22.04/ubuntu-jammy-oci-amd64-root.tar.gz 'tar -t'
+++ b/ubuntu_22.04/blobs/sha256/677076032cca0a2362d25cf3660072e738d1b96fe860409a33ce901d695d7ee8 'tar -t'
@@ -30,6 +30,8 @@ etc/apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg
etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
etc/bash.bashrc
etc/bindresvport.blacklist
+etc/cloud/
+etc/cloud/build.info
etc/cron.d/
etc/cron.daily/
etc/cron.daily/apt-compat
diff --git a/ubuntu_22.04/blobs/sha256/eecba05a9ccbc219cb0f0dd280034c6ee1aab0b00b458e680f9c4efc6ca3feda b/ubuntu_22.04/blobs/sha256/eecba05a9ccbc219cb0f0dd280034c6ee1aab0b00b458e680f9c4efc6ca3feda
new file mode 100644
index 0000000..73a3c2b
--- /dev/null
+++ b/ubuntu_22.04/blobs/sha256/eecba05a9ccbc219cb0f0dd280034c6ee1aab0b00b458e680f9c4efc6ca3feda
@@ -0,0 +1,16 @@
+{
+ "config": {
+ "digest": "sha256:58db3edaf2be6e80f628796355b1bdeaf8bea1692b402f48b7e7b8d1ff100b02",
+ "mediaType": "application/vnd.docker.container.image.v1+json",
+ "size": 2299
+ },
+ "layers": [
+ {
+ "digest": "sha256:677076032cca0a2362d25cf3660072e738d1b96fe860409a33ce901d695d7ee8",
+ "mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
+ "size": 29528717
+ }
+ ],
+ "mediaType": "application/vnd.oci.image.manifest.v1+json",
+ "schemaVersion": 2
+}
diff --git a/ubuntu_22.04/build-info.txt b/ubuntu_22.04/build-info.txt
deleted file mode 100644
index 918abbc..0000000
diff --git a/ubuntu_22.04/index.json b/ubuntu_22.04/index.json
new file mode 100644
index 0000000..a42e4fb
--- /dev/null
+++ b/ubuntu_22.04/index.json
@@ -0,0 +1,10 @@
+{
+ "manifests": [
+ {
+ "digest": "sha256:eecba05a9ccbc219cb0f0dd280034c6ee1aab0b00b458e680f9c4efc6ca3feda",
+ "mediaType": "application/vnd.oci.image.manifest.v1+json",
+ "size": 436
+ }
+ ],
+ "schemaVersion": 2
+}
diff --git a/ubuntu_22.04/ubuntu-jammy-oci-amd64-root.manifest b/ubuntu_22.04/ubuntu-jammy-oci-amd64-root.manifest
deleted file mode 100644
index 0309bfc..0000000
diff --git a/ubuntu_22.04/ubuntu-jammy-oci-amd64-root.tar.gz b/ubuntu_22.04/ubuntu-jammy-oci-amd64-root.tar.gz
deleted file mode 100644
index adccbd9..0000000
diff --git a/ubuntu_22.10/.dockerignore b/ubuntu_22.10/.dockerignore
deleted file mode 100644
index 6b8710a..0000000
diff --git a/ubuntu_22.10/Dockerfile b/ubuntu_22.10/Dockerfile
deleted file mode 100644
index c740d42..0000000
diff --git a/ubuntu_22.10/blobs/sha256/10c2f4041af137e6b0ba5c793df3dfdf4e72a4e011ce6847f4cc0247b9bbf7f2 b/ubuntu_22.10/blobs/sha256/10c2f4041af137e6b0ba5c793df3dfdf4e72a4e011ce6847f4cc0247b9bbf7f2
new file mode 100644
index 0000000..0ed4961
--- /dev/null
+++ b/ubuntu_22.10/blobs/sha256/10c2f4041af137e6b0ba5c793df3dfdf4e72a4e011ce6847f4cc0247b9bbf7f2
@@ -0,0 +1,99 @@
+{
+ "architecture": "amd64",
+ "config": {
+ "AttachStderr": false,
+ "AttachStdin": false,
+ "AttachStdout": false,
+ "Cmd": [
+ "/bin/bash"
+ ],
+ "Domainname": "",
+ "Entrypoint": null,
+ "Env": [
+ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ ],
+ "Hostname": "",
+ "Image": "sha256:41b870e227c11822e701e5162f29001d81036242cefeda96baa05c4b2551b179",
+ "Labels": {
+ "org.opencontainers.image.ref.name": "ubuntu",
+ "org.opencontainers.image.version": "22.10"
+ },
+ "OnBuild": null,
+ "OpenStdin": false,
+ "StdinOnce": false,
+ "Tty": false,
+ "User": "",
+ "Volumes": null,
+ "WorkingDir": ""
+ },
+ "container": "05b6df4b95667f0f7b71640e30fad1941eda75ce9ce54cbe5b3a4df16941ff87",
+ "container_config": {
+ "AttachStderr": false,
+ "AttachStdin": false,
+ "AttachStdout": false,
+ "Cmd": [
+ "/bin/sh",
+ "-c",
+ "#(nop) ",
+ "CMD [\"/bin/bash\"]"
+ ],
+ "Domainname": "",
+ "Entrypoint": null,
+ "Env": [
+ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ ],
+ "Hostname": "05b6df4b9566",
+ "Image": "sha256:41b870e227c11822e701e5162f29001d81036242cefeda96baa05c4b2551b179",
+ "Labels": {
+ "org.opencontainers.image.ref.name": "ubuntu",
+ "org.opencontainers.image.version": "22.10"
+ },
+ "OnBuild": null,
+ "OpenStdin": false,
+ "StdinOnce": false,
+ "Tty": false,
+ "User": "",
+ "Volumes": null,
+ "WorkingDir": ""
+ },
+ "created": "2023-01-26T11:51:15.003446747Z",
+ "docker_version": "20.10.12",
+ "history": [
+ {
+ "created": "2023-01-26T11:51:12.847801907Z",
+ "created_by": "/bin/sh -c #(nop) ARG RELEASE",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T11:51:12.89891811Z",
+ "created_by": "/bin/sh -c #(nop) ARG LAUNCHPAD_BUILD_ARCH",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T11:51:12.952711335Z",
+ "created_by": "/bin/sh -c #(nop) LABEL org.opencontainers.image.ref.name=ubuntu",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T11:51:13.003099313Z",
+ "created_by": "/bin/sh -c #(nop) LABEL org.opencontainers.image.version=22.10",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-26T11:51:14.755859452Z",
+ "created_by": "/bin/sh -c #(nop) ADD file:e886423892b371751386c0ce7147599acb72d8fb528eaaa78092b879d9ff58ce in / "
+ },
+ {
+ "created": "2023-01-26T11:51:15.003446747Z",
+ "created_by": "/bin/sh -c #(nop) CMD [\"/bin/bash\"]",
+ "empty_layer": true
+ }
+ ],
+ "os": "linux",
+ "rootfs": {
+ "diff_ids": [
+ "sha256:18d8ae69899b9689ef89fe85cbf706e28e187a40392290c8fb0be30a3e3caf51"
+ ],
+ "type": "layers"
+ }
+}
diff --git a/ubuntu_22.10/ubuntu-kinetic-oci-amd64-root.tar.gz 'tar -t' b/ubuntu_22.10/blobs/sha256/256644d5a307c3efeca6ae2854b6329a2753157868dc5548e33161b377658e6a 'tar -t'
similarity index 99%
rename from ubuntu_22.10/ubuntu-kinetic-oci-amd64-root.tar.gz 'tar -t'
rename to ubuntu_22.10/blobs/sha256/256644d5a307c3efeca6ae2854b6329a2753157868dc5548e33161b377658e6a 'tar -t'
index d721686..af1f12e 100644
--- a/ubuntu_22.10/ubuntu-kinetic-oci-amd64-root.tar.gz 'tar -t'
+++ b/ubuntu_22.10/blobs/sha256/256644d5a307c3efeca6ae2854b6329a2753157868dc5548e33161b377658e6a 'tar -t'
@@ -31,6 +31,8 @@ etc/apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg
etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
etc/bash.bashrc
etc/bindresvport.blacklist
+etc/cloud/
+etc/cloud/build.info
etc/cron.d/
etc/cron.daily/
etc/cron.daily/apt-compat
diff --git a/ubuntu_22.10/blobs/sha256/ef3c777a7db8a2c49d31284cc924fc3a2f471dce44378a18d6d1fefff5a63fe5 b/ubuntu_22.10/blobs/sha256/ef3c777a7db8a2c49d31284cc924fc3a2f471dce44378a18d6d1fefff5a63fe5
new file mode 100644
index 0000000..d4ad804
--- /dev/null
+++ b/ubuntu_22.10/blobs/sha256/ef3c777a7db8a2c49d31284cc924fc3a2f471dce44378a18d6d1fefff5a63fe5
@@ -0,0 +1,16 @@
+{
+ "config": {
+ "digest": "sha256:10c2f4041af137e6b0ba5c793df3dfdf4e72a4e011ce6847f4cc0247b9bbf7f2",
+ "mediaType": "application/vnd.docker.container.image.v1+json",
+ "size": 2298
+ },
+ "layers": [
+ {
+ "digest": "sha256:256644d5a307c3efeca6ae2854b6329a2753157868dc5548e33161b377658e6a",
+ "mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
+ "size": 26691650
+ }
+ ],
+ "mediaType": "application/vnd.oci.image.manifest.v1+json",
+ "schemaVersion": 2
+}
diff --git a/ubuntu_22.10/build-info.txt b/ubuntu_22.10/build-info.txt
deleted file mode 100644
index 918abbc..0000000
diff --git a/ubuntu_22.10/index.json b/ubuntu_22.10/index.json
new file mode 100644
index 0000000..d3ac27a
--- /dev/null
+++ b/ubuntu_22.10/index.json
@@ -0,0 +1,10 @@
+{
+ "manifests": [
+ {
+ "digest": "sha256:ef3c777a7db8a2c49d31284cc924fc3a2f471dce44378a18d6d1fefff5a63fe5",
+ "mediaType": "application/vnd.oci.image.manifest.v1+json",
+ "size": 436
+ }
+ ],
+ "schemaVersion": 2
+}
diff --git a/ubuntu_22.10/ubuntu-kinetic-oci-amd64-root.manifest b/ubuntu_22.10/ubuntu-kinetic-oci-amd64-root.manifest
deleted file mode 100644
index 2e88c7a..0000000
diff --git a/ubuntu_22.10/ubuntu-kinetic-oci-amd64-root.tar.gz b/ubuntu_22.10/ubuntu-kinetic-oci-amd64-root.tar.gz
deleted file mode 100644
index e00e400..0000000
diff --git a/ubuntu_23.04/.dockerignore b/ubuntu_23.04/.dockerignore
deleted file mode 100644
index 6b8710a..0000000
diff --git a/ubuntu_23.04/Dockerfile b/ubuntu_23.04/Dockerfile
deleted file mode 100644
index 501dc51..0000000
diff --git a/ubuntu_23.04/blobs/sha256/096628db4ff280b69ee9eaca21f0cfc152776e1243bc6c1320b436934188d5e5 b/ubuntu_23.04/blobs/sha256/096628db4ff280b69ee9eaca21f0cfc152776e1243bc6c1320b436934188d5e5
new file mode 100644
index 0000000..dedc1bb
--- /dev/null
+++ b/ubuntu_23.04/blobs/sha256/096628db4ff280b69ee9eaca21f0cfc152776e1243bc6c1320b436934188d5e5
@@ -0,0 +1,99 @@
+{
+ "architecture": "amd64",
+ "config": {
+ "AttachStderr": false,
+ "AttachStdin": false,
+ "AttachStdout": false,
+ "Cmd": [
+ "/bin/bash"
+ ],
+ "Domainname": "",
+ "Entrypoint": null,
+ "Env": [
+ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ ],
+ "Hostname": "",
+ "Image": "sha256:f01661c63791fe1e28896a54aca09b440a854206c7c9a3e5e665241b9be9fe3d",
+ "Labels": {
+ "org.opencontainers.image.ref.name": "ubuntu",
+ "org.opencontainers.image.version": "23.04"
+ },
+ "OnBuild": null,
+ "OpenStdin": false,
+ "StdinOnce": false,
+ "Tty": false,
+ "User": "",
+ "Volumes": null,
+ "WorkingDir": ""
+ },
+ "container": "d6978bcaf04170b02f50ca1371024e94c94606cb2c0b0d7eba164302d7e04508",
+ "container_config": {
+ "AttachStderr": false,
+ "AttachStdin": false,
+ "AttachStdout": false,
+ "Cmd": [
+ "/bin/sh",
+ "-c",
+ "#(nop) ",
+ "CMD [\"/bin/bash\"]"
+ ],
+ "Domainname": "",
+ "Entrypoint": null,
+ "Env": [
+ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ ],
+ "Hostname": "d6978bcaf041",
+ "Image": "sha256:f01661c63791fe1e28896a54aca09b440a854206c7c9a3e5e665241b9be9fe3d",
+ "Labels": {
+ "org.opencontainers.image.ref.name": "ubuntu",
+ "org.opencontainers.image.version": "23.04"
+ },
+ "OnBuild": null,
+ "OpenStdin": false,
+ "StdinOnce": false,
+ "Tty": false,
+ "User": "",
+ "Volumes": null,
+ "WorkingDir": ""
+ },
+ "created": "2023-01-25T14:47:07.874276767Z",
+ "docker_version": "20.10.12",
+ "history": [
+ {
+ "created": "2023-01-25T14:47:05.436191792Z",
+ "created_by": "/bin/sh -c #(nop) ARG RELEASE",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-25T14:47:05.503514931Z",
+ "created_by": "/bin/sh -c #(nop) ARG LAUNCHPAD_BUILD_ARCH",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-25T14:47:05.57042716Z",
+ "created_by": "/bin/sh -c #(nop) LABEL org.opencontainers.image.ref.name=ubuntu",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-25T14:47:05.629077906Z",
+ "created_by": "/bin/sh -c #(nop) LABEL org.opencontainers.image.version=23.04",
+ "empty_layer": true
+ },
+ {
+ "created": "2023-01-25T14:47:07.553887091Z",
+ "created_by": "/bin/sh -c #(nop) ADD file:5a9904395b52775ee7c10a49efc741d32b587e2cd447b8deb66811c3fb3b37a4 in / "
+ },
+ {
+ "created": "2023-01-25T14:47:07.874276767Z",
+ "created_by": "/bin/sh -c #(nop) CMD [\"/bin/bash\"]",
+ "empty_layer": true
+ }
+ ],
+ "os": "linux",
+ "rootfs": {
+ "diff_ids": [
+ "sha256:fcf069f223e9f15b25a56edc51dcefee725b713364a5ec70c37df488c62b7184"
+ ],
+ "type": "layers"
+ }
+}
diff --git a/ubuntu_23.04/blobs/sha256/76f55c747c6e3cc7a49f6bade839a8fbca72e0338fec92b54e58b8d15baf836d b/ubuntu_23.04/blobs/sha256/76f55c747c6e3cc7a49f6bade839a8fbca72e0338fec92b54e58b8d15baf836d
new file mode 100644
index 0000000..100bf2c
--- /dev/null
+++ b/ubuntu_23.04/blobs/sha256/76f55c747c6e3cc7a49f6bade839a8fbca72e0338fec92b54e58b8d15baf836d
@@ -0,0 +1,16 @@
+{
+ "config": {
+ "digest": "sha256:096628db4ff280b69ee9eaca21f0cfc152776e1243bc6c1320b436934188d5e5",
+ "mediaType": "application/vnd.docker.container.image.v1+json",
+ "size": 2298
+ },
+ "layers": [
+ {
+ "digest": "sha256:85cec64d15ef8b1eb3ff65555dbe92d7e3ea2a21f3e1fe1206ed85e221b3593d",
+ "mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
+ "size": 26594295
+ }
+ ],
+ "mediaType": "application/vnd.oci.image.manifest.v1+json",
+ "schemaVersion": 2
+}
diff --git a/ubuntu_23.04/ubuntu-lunar-oci-amd64-root.tar.gz 'tar -t' b/ubuntu_23.04/blobs/sha256/85cec64d15ef8b1eb3ff65555dbe92d7e3ea2a21f3e1fe1206ed85e221b3593d 'tar -t'
similarity index 99%
rename from ubuntu_23.04/ubuntu-lunar-oci-amd64-root.tar.gz 'tar -t'
rename to ubuntu_23.04/blobs/sha256/85cec64d15ef8b1eb3ff65555dbe92d7e3ea2a21f3e1fe1206ed85e221b3593d 'tar -t'
index a9ac41e..fb66aa6 100644
--- a/ubuntu_23.04/ubuntu-lunar-oci-amd64-root.tar.gz 'tar -t'
+++ b/ubuntu_23.04/blobs/sha256/85cec64d15ef8b1eb3ff65555dbe92d7e3ea2a21f3e1fe1206ed85e221b3593d 'tar -t'
@@ -991,9 +991,9 @@ usr/lib/x86_64-linux-gnu/libext2fs.so.2.4
usr/lib/x86_64-linux-gnu/libffi.so.8
usr/lib/x86_64-linux-gnu/libffi.so.8.1.2
usr/lib/x86_64-linux-gnu/libform.so.6
-usr/lib/x86_64-linux-gnu/libform.so.6.3
+usr/lib/x86_64-linux-gnu/libform.so.6.4
usr/lib/x86_64-linux-gnu/libformw.so.6
-usr/lib/x86_64-linux-gnu/libformw.so.6.3
+usr/lib/x86_64-linux-gnu/libformw.so.6.4
usr/lib/x86_64-linux-gnu/libgcc_s.so.1
usr/lib/x86_64-linux-gnu/libgcrypt.so.20
usr/lib/x86_64-linux-gnu/libgcrypt.so.20.4.1
@@ -1010,22 +1010,22 @@ usr/lib/x86_64-linux-gnu/libidn2.so.0.3.8
usr/lib/x86_64-linux-gnu/liblz4.so.1
usr/lib/x86_64-linux-gnu/liblz4.so.1.9.4
usr/lib/x86_64-linux-gnu/liblzma.so.5
-usr/lib/x86_64-linux-gnu/liblzma.so.5.2.9
+usr/lib/x86_64-linux-gnu/liblzma.so.5.4.1
usr/lib/x86_64-linux-gnu/libmd.so.0
usr/lib/x86_64-linux-gnu/libmd.so.0.0.5
usr/lib/x86_64-linux-gnu/libmemusage.so
usr/lib/x86_64-linux-gnu/libmenu.so.6
-usr/lib/x86_64-linux-gnu/libmenu.so.6.3
+usr/lib/x86_64-linux-gnu/libmenu.so.6.4
usr/lib/x86_64-linux-gnu/libmenuw.so.6
-usr/lib/x86_64-linux-gnu/libmenuw.so.6.3
+usr/lib/x86_64-linux-gnu/libmenuw.so.6.4
usr/lib/x86_64-linux-gnu/libmount.so.1
usr/lib/x86_64-linux-gnu/libmount.so.1.1.0
usr/lib/x86_64-linux-gnu/libm.so.6
usr/lib/x86_64-linux-gnu/libmvec.so.1
usr/lib/x86_64-linux-gnu/libncurses.so.6
-usr/lib/x86_64-linux-gnu/libncurses.so.6.3
+usr/lib/x86_64-linux-gnu/libncurses.so.6.4
usr/lib/x86_64-linux-gnu/libncursesw.so.6
-usr/lib/x86_64-linux-gnu/libncursesw.so.6.3
+usr/lib/x86_64-linux-gnu/libncursesw.so.6.4
usr/lib/x86_64-linux-gnu/libnettle.so.8
usr/lib/x86_64-linux-gnu/libnettle.so.8.6
usr/lib/x86_64-linux-gnu/libnsl.so.1
@@ -1042,16 +1042,12 @@ usr/lib/x86_64-linux-gnu/libpam_misc.so.0.82.1
usr/lib/x86_64-linux-gnu/libpam.so.0
usr/lib/x86_64-linux-gnu/libpam.so.0.85.1
usr/lib/x86_64-linux-gnu/libpanel.so.6
-usr/lib/x86_64-linux-gnu/libpanel.so.6.3
+usr/lib/x86_64-linux-gnu/libpanel.so.6.4
usr/lib/x86_64-linux-gnu/libpanelw.so.6
-usr/lib/x86_64-linux-gnu/libpanelw.so.6.3
+usr/lib/x86_64-linux-gnu/libpanelw.so.6.4
usr/lib/x86_64-linux-gnu/libpcprofile.so
usr/lib/x86_64-linux-gnu/libpcre2-8.so.0
usr/lib/x86_64-linux-gnu/libpcre2-8.so.0.11.0
-usr/lib/x86_64-linux-gnu/libpcreposix.so.3
-usr/lib/x86_64-linux-gnu/libpcreposix.so.3.13.3
-usr/lib/x86_64-linux-gnu/libpcre.so.3
-usr/lib/x86_64-linux-gnu/libpcre.so.3.13.3
usr/lib/x86_64-linux-gnu/libprocps.so.8
usr/lib/x86_64-linux-gnu/libprocps.so.8.0.3
usr/lib/x86_64-linux-gnu/libpthread.so.0
@@ -1074,9 +1070,9 @@ usr/lib/x86_64-linux-gnu/libtasn1.so.6
usr/lib/x86_64-linux-gnu/libtasn1.so.6.6.3
usr/lib/x86_64-linux-gnu/libthread_db.so.1
usr/lib/x86_64-linux-gnu/libtic.so.6
-usr/lib/x86_64-linux-gnu/libtic.so.6.3
+usr/lib/x86_64-linux-gnu/libtic.so.6.4
usr/lib/x86_64-linux-gnu/libtinfo.so.6
-usr/lib/x86_64-linux-gnu/libtinfo.so.6.3
+usr/lib/x86_64-linux-gnu/libtinfo.so.6.4
usr/lib/x86_64-linux-gnu/libudev.so.1
usr/lib/x86_64-linux-gnu/libudev.so.1.7.4
usr/lib/x86_64-linux-gnu/libunistring.so.2
@@ -2165,7 +2161,7 @@ usr/share/doc/diffutils/
usr/share/doc/diffutils/changelog.Debian.gz
usr/share/doc/diffutils/copyright
usr/share/doc/dpkg/
-usr/share/doc/dpkg/changelog.Debian.gz
+usr/share/doc/dpkg/changelog.gz
usr/share/doc/dpkg/copyright
usr/share/doc/e2fsprogs/
usr/share/doc/e2fsprogs/changelog.Debian.gz
@@ -2301,9 +2297,6 @@ usr/share/doc/libpam-runtime/NEWS.Debian.gz
usr/share/doc/libpcre2-8-0/
usr/share/doc/libpcre2-8-0/changelog.Debian.gz
usr/share/doc/libpcre2-8-0/copyright
-usr/share/doc/libpcre3/
-usr/share/doc/libpcre3/changelog.Debian.gz
-usr/share/doc/libpcre3/copyright
usr/share/doc/libprocps8/
usr/share/doc/libprocps8/changelog.Debian.gz
usr/share/doc/libprocps8/copyright
@@ -2726,7 +2719,6 @@ usr/share/man/ja/man8/
usr/share/man/ko/
usr/share/man/ko/man1/
usr/share/man/man1/
-usr/share/man/man3/
usr/share/man/man5/
usr/share/man/man7/
usr/share/man/man8/
@@ -3234,11 +3226,6 @@ var/lib/dpkg/info/libpcre2-8-0:amd64.md5sums
var/lib/dpkg/info/libpcre2-8-0:amd64.shlibs
var/lib/dpkg/info/libpcre2-8-0:amd64.symbols
var/lib/dpkg/info/libpcre2-8-0:amd64.triggers
-var/lib/dpkg/info/libpcre3:amd64.list
-var/lib/dpkg/info/libpcre3:amd64.md5sums
-var/lib/dpkg/info/libpcre3:amd64.shlibs
-var/lib/dpkg/info/libpcre3:amd64.symbols
-var/lib/dpkg/info/libpcre3:amd64.triggers
var/lib/dpkg/info/libprocps8:amd64.list
var/lib/dpkg/info/libprocps8:amd64.md5sums
var/lib/dpkg/info/libprocps8:amd64.shlibs
diff --git a/ubuntu_23.04/build-info.txt b/ubuntu_23.04/build-info.txt
deleted file mode 100644
index 631e7a7..0000000
diff --git a/ubuntu_23.04/index.json b/ubuntu_23.04/index.json
new file mode 100644
index 0000000..77294fb
--- /dev/null
+++ b/ubuntu_23.04/index.json
@@ -0,0 +1,10 @@
+{
+ "manifests": [
+ {
+ "digest": "sha256:76f55c747c6e3cc7a49f6bade839a8fbca72e0338fec92b54e58b8d15baf836d",
+ "mediaType": "application/vnd.oci.image.manifest.v1+json",
+ "size": 436
+ }
+ ],
+ "schemaVersion": 2
+}
diff --git a/ubuntu_23.04/ubuntu-lunar-oci-amd64-root.manifest b/ubuntu_23.04/ubuntu-lunar-oci-amd64-root.manifest
deleted file mode 100644
index feff75d..0000000
diff --git a/ubuntu_23.04/ubuntu-lunar-oci-amd64-root.tar.gz b/ubuntu_23.04/ubuntu-lunar-oci-amd64-root.tar.gz
deleted file mode 100644
index ac247d9..0000000 |
|
Implementation of |
tianon
force-pushed
the
diff-oci
branch
2 times, most recently
from
2512644 to
1080a47
Compare
Also, update other scripts to use `bashbrew fetch` and `gitCache` effectively to remove unnecessary reimplementations of `BASHBREW_CACHE` default value calculation (new in bashbrew v0.1.8). As a parting gift, add the raw list of total supported architectures to a file so it's more obvious when new ones are added or removed (like `ubuntu` losing `riscv64`).
|
Temporarily did the branch dance and stole the commit from #14094 so this can run and verify that it's working correctly and now the commits are gone presumably because there's a fix for the media types in progress 😂 I wasn't fast enough! |
|
I definitely misinterpreted the error, and I'm not 100% sure why we're getting that error, actually. 😭 I'm digging into it -- that version is old and should've fetched just fine (as I just verified with |
|
Oh, I think I understand now -- #14094 is updating (Edit: sorry, moving this comment/discussion to #14094 (comment) -- gonna try munging this PR a little to get a successful diff) |
tianon
force-pushed
the
diff-oci
branch
2 times, most recently
from
2c1ab15 to
93cdf45
Compare
Diff for 9020e75:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6aaf144..c7ebd99 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -34,19 +34,19 @@ ppc64le-GitFetch: refs/tags/dist-focal-ppc64le-20230126
s390x-GitCommit: ea857969708c0de43008dd4f63d589401a1bf34a
s390x-GitFetch: refs/tags/dist-focal-s390x-20230126
-Tags: 22.04, jammy-20230126, jammy, latest
+Tags: 22.04, jammy-20230207, jammy, latest
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
Directory: oci
-amd64-GitCommit: d4e91f86e34e0de683c46f08178d93fcf83a515d
-amd64-GitFetch: refs/tags/dist-jammy-amd64-20230126
-arm32v7-GitCommit: 8704d607298a82d727c4ecb7bf4983ca5c41999e
-arm32v7-GitFetch: refs/tags/dist-jammy-arm32v7-20230126
-arm64v8-GitCommit: faebb02867d910fc3337a1cb7d3b2d0527920569
-arm64v8-GitFetch: refs/tags/dist-jammy-arm64v8-20230126
-ppc64le-GitCommit: b90ed3bfda7d85aa2a5ae86c3b18726747f4f71f
-ppc64le-GitFetch: refs/tags/dist-jammy-ppc64le-20230126
-s390x-GitCommit: 192cec31ced5114b13459c525d7ed3fb565e21f2
-s390x-GitFetch: refs/tags/dist-jammy-s390x-20230126
+amd64-GitCommit: 7d7e89e020a975f43c39e8e4e27f724ba2e19a05
+amd64-GitFetch: refs/tags/dist-jammy-amd64-20230207
+arm32v7-GitCommit: f8dad8b17e78adc2dfcd583ece27fc1983f02da5
+arm32v7-GitFetch: refs/tags/dist-jammy-arm32v7-20230207
+arm64v8-GitCommit: 788fe323de205f764981e717951c167a01296281
+arm64v8-GitFetch: refs/tags/dist-jammy-arm64v8-20230207
+ppc64le-GitCommit: 702ad21aae8e51212fa19764d59bcb603616b7a0
+ppc64le-GitFetch: refs/tags/dist-jammy-ppc64le-20230207
+s390x-GitCommit: 2b150cca73323783e3ae7585837f875443ec3011
+s390x-GitFetch: refs/tags/dist-jammy-s390x-20230207
Tags: 22.10, kinetic-20230126, kinetic, rolling
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
@@ -62,16 +62,16 @@ ppc64le-GitFetch: refs/tags/dist-kinetic-ppc64le-20230126
s390x-GitCommit: 6e45502ade2d3eea4c402253555a12df0a78e5f5
s390x-GitFetch: refs/tags/dist-kinetic-s390x-20230126
-Tags: 23.04, lunar-20230128, lunar, devel
+Tags: 23.04, lunar-20230210, lunar, devel
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
Directory: oci
-amd64-GitCommit: edd50e68967994c3b3f2fd08b5013190f1776a3f
-amd64-GitFetch: refs/tags/dist-lunar-amd64-20230128
-arm32v7-GitCommit: e2920847278ba698618bac555f2dfd6ac8210cf0
-arm32v7-GitFetch: refs/tags/dist-lunar-arm32v7-20230128
-arm64v8-GitCommit: af3e02164d684afd1bf4330641c7f7e24a76862d
-arm64v8-GitFetch: refs/tags/dist-lunar-arm64v8-20230128
-ppc64le-GitCommit: 0bfb7178e3c2abe05f39ff9f0440b5401b546aaf
-ppc64le-GitFetch: refs/tags/dist-lunar-ppc64le-20230128
-s390x-GitCommit: e9089436f79b702736c5bfe2daf5394715d7b13a
-s390x-GitFetch: refs/tags/dist-lunar-s390x-20230128
+amd64-GitCommit: 16c0ee197714e8f0605c1e1e07a5ad40889f13de
+amd64-GitFetch: refs/tags/dist-lunar-amd64-20230210
+arm32v7-GitCommit: 6515ec05428888dc2bcfbc5e64e9c84ad0c608ff
+arm32v7-GitFetch: refs/tags/dist-lunar-arm32v7-20230210
+arm64v8-GitCommit: be68557d966f76529042996d763d776c5f79add2
+arm64v8-GitFetch: refs/tags/dist-lunar-arm64v8-20230210
+ppc64le-GitCommit: 8588fb786e3857894fa188b951839efa005fa720
+ppc64le-GitFetch: refs/tags/dist-lunar-ppc64le-20230210
+s390x-GitCommit: 9f56606c2f8f6d0ff0c35e0828f7e7f3afe6a129
+s390x-GitFetch: refs/tags/dist-lunar-s390x-20230210
diff --git a/_bashbrew-list b/_bashbrew-list
index 3a2be10..a2c1a32 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -9,10 +9,10 @@ ubuntu:devel
ubuntu:focal
ubuntu:focal-20230126
ubuntu:jammy
-ubuntu:jammy-20230126
+ubuntu:jammy-20230207
ubuntu:kinetic
ubuntu:kinetic-20230126
ubuntu:latest
ubuntu:lunar
-ubuntu:lunar-20230128
+ubuntu:lunar-20230210
ubuntu:rolling
diff --git a/ubuntu_devel/blobs/sha256/db781b8aed497363312ef32499cbfac28821e0494db7f0cadc4e716853e02a12 'tar -t' b/ubuntu_devel/blobs/sha256/7054683437310bd210e36f99b65a6d88985bb321253657a41002d71012bd94ef 'tar -t'
similarity index 100%
rename from ubuntu_devel/blobs/sha256/db781b8aed497363312ef32499cbfac28821e0494db7f0cadc4e716853e02a12 'tar -t'
rename to ubuntu_devel/blobs/sha256/7054683437310bd210e36f99b65a6d88985bb321253657a41002d71012bd94ef 'tar -t'
diff --git a/ubuntu_devel/blobs/sha256/beb2152822b716b4deac2996f16bc84db0a14b7cbc549579635590438f9c0e1d b/ubuntu_devel/blobs/sha256/7c47a4b8fdf5ef53487b1c9f1ee1649366c8b57731b84e013f8a0a80764dd290
similarity index 68%
rename from ubuntu_devel/blobs/sha256/beb2152822b716b4deac2996f16bc84db0a14b7cbc549579635590438f9c0e1d
rename to ubuntu_devel/blobs/sha256/7c47a4b8fdf5ef53487b1c9f1ee1649366c8b57731b84e013f8a0a80764dd290
index dcd2572..ee6114e 100644
--- a/ubuntu_devel/blobs/sha256/beb2152822b716b4deac2996f16bc84db0a14b7cbc549579635590438f9c0e1d
+++ b/ubuntu_devel/blobs/sha256/7c47a4b8fdf5ef53487b1c9f1ee1649366c8b57731b84e013f8a0a80764dd290
@@ -13,7 +13,7 @@
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
],
"Hostname": "",
- "Image": "sha256:0976c6deda049de276f2861ee5a43647fb12de87a887f947f88848578e26b5ad",
+ "Image": "sha256:dad663ae25e45df038fd2218edc8765f59092599d994d0bbe11f3c162b2db5eb",
"Labels": {
"org.opencontainers.image.ref.name": "ubuntu",
"org.opencontainers.image.version": "23.04"
@@ -26,7 +26,7 @@
"Volumes": null,
"WorkingDir": ""
},
- "container": "d4d26c094bc2feec9cccfbff4b4b6ba3b56409bab713ea7aea284d05ec6c8394",
+ "container": "efe4082ca8d617d11cc900e289ae7110d7ba0153f988e9bf32240bef3c171dd5",
"container_config": {
"AttachStderr": false,
"AttachStdin": false,
@@ -42,8 +42,8 @@
"Env": [
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
],
- "Hostname": "d4d26c094bc2",
- "Image": "sha256:0976c6deda049de276f2861ee5a43647fb12de87a887f947f88848578e26b5ad",
+ "Hostname": "efe4082ca8d6",
+ "Image": "sha256:dad663ae25e45df038fd2218edc8765f59092599d994d0bbe11f3c162b2db5eb",
"Labels": {
"org.opencontainers.image.ref.name": "ubuntu",
"org.opencontainers.image.version": "23.04"
@@ -56,35 +56,35 @@
"Volumes": null,
"WorkingDir": ""
},
- "created": "2023-01-28T05:15:54.666972697Z",
+ "created": "2023-02-10T16:47:52.467323939Z",
"docker_version": "20.10.12",
"history": [
{
- "created": "2023-01-28T05:15:52.321211506Z",
+ "created": "2023-02-10T16:47:50.267688793Z",
"created_by": "/bin/sh -c #(nop) ARG RELEASE",
"empty_layer": true
},
{
- "created": "2023-01-28T05:15:52.393077893Z",
+ "created": "2023-02-10T16:47:50.323052234Z",
"created_by": "/bin/sh -c #(nop) ARG LAUNCHPAD_BUILD_ARCH",
"empty_layer": true
},
{
- "created": "2023-01-28T05:15:52.473283995Z",
+ "created": "2023-02-10T16:47:50.387537979Z",
"created_by": "/bin/sh -c #(nop) LABEL org.opencontainers.image.ref.name=ubuntu",
"empty_layer": true
},
{
- "created": "2023-01-28T05:15:52.560751353Z",
+ "created": "2023-02-10T16:47:50.438766928Z",
"created_by": "/bin/sh -c #(nop) LABEL org.opencontainers.image.version=23.04",
"empty_layer": true
},
{
- "created": "2023-01-28T05:15:54.412182763Z",
- "created_by": "/bin/sh -c #(nop) ADD file:915f1a27db0a8b9a9dd58d40086cb7d45b2722e8ceb29ed8bcb306d4dcd3688e in / "
+ "created": "2023-02-10T16:47:52.223669525Z",
+ "created_by": "/bin/sh -c #(nop) ADD file:1e1cad9eac488acf68362300329a7c0b7d4cb552f3b24d12cffc108bebea7772 in / "
},
{
- "created": "2023-01-28T05:15:54.666972697Z",
+ "created": "2023-02-10T16:47:52.467323939Z",
"created_by": "/bin/sh -c #(nop) CMD [\"/bin/bash\"]",
"empty_layer": true
}
@@ -92,7 +92,7 @@
"os": "linux",
"rootfs": {
"diff_ids": [
- "sha256:0277ca2d0373381e1d969949df250a58a64fb7f554ca6851e33f27541209da37"
+ "sha256:ad473ec664506903a2c032f608fc1537a9414603e453ad012ad7fe27ae13bf39"
],
"type": "layers"
}
diff --git a/ubuntu_latest/blobs/sha256/c985bc3f77946b8e92c9a3648c6f31751a7dd972e06604785e47303f4ad47c4c b/ubuntu_devel/blobs/sha256/92a3642d73b5dc97caed4f9baf34ba82a79bcbc543150aea5f58f46ac428d3f1
similarity index 57%
rename from ubuntu_latest/blobs/sha256/c985bc3f77946b8e92c9a3648c6f31751a7dd972e06604785e47303f4ad47c4c
rename to ubuntu_devel/blobs/sha256/92a3642d73b5dc97caed4f9baf34ba82a79bcbc543150aea5f58f46ac428d3f1
index 8d29745..e4584e5 100644
--- a/ubuntu_latest/blobs/sha256/c985bc3f77946b8e92c9a3648c6f31751a7dd972e06604785e47303f4ad47c4c
+++ b/ubuntu_devel/blobs/sha256/92a3642d73b5dc97caed4f9baf34ba82a79bcbc543150aea5f58f46ac428d3f1
@@ -1,14 +1,14 @@
{
"config": {
- "digest": "sha256:58db3edaf2be6e80f628796355b1bdeaf8bea1692b402f48b7e7b8d1ff100b02",
+ "digest": "sha256:7c47a4b8fdf5ef53487b1c9f1ee1649366c8b57731b84e013f8a0a80764dd290",
"mediaType": "application/vnd.oci.image.config.v1+json",
"size": 2299
},
"layers": [
{
- "digest": "sha256:677076032cca0a2362d25cf3660072e738d1b96fe860409a33ce901d695d7ee8",
+ "digest": "sha256:7054683437310bd210e36f99b65a6d88985bb321253657a41002d71012bd94ef",
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
- "size": 29528717
+ "size": 26553934
}
],
"mediaType": "application/vnd.oci.image.manifest.v1+json",
diff --git a/ubuntu_devel/index.json b/ubuntu_devel/index.json
index 2e66dab..3288b2b 100644
--- a/ubuntu_devel/index.json
+++ b/ubuntu_devel/index.json
@@ -1,7 +1,7 @@
{
"manifests": [
{
- "digest": "sha256:52293638ba652a2e8f9e1c1cfcc905839b1f2a9e671ddcc9bf77909b6bf527d0",
+ "digest": "sha256:92a3642d73b5dc97caed4f9baf34ba82a79bcbc543150aea5f58f46ac428d3f1",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"size": 424
}
diff --git a/ubuntu_latest/blobs/sha256/58db3edaf2be6e80f628796355b1bdeaf8bea1692b402f48b7e7b8d1ff100b02 b/ubuntu_latest/blobs/sha256/900f32031c55c890a735d8c1d96eee1de593fab2d6216449c7ad6ffaf180d491
similarity index 68%
rename from ubuntu_latest/blobs/sha256/58db3edaf2be6e80f628796355b1bdeaf8bea1692b402f48b7e7b8d1ff100b02
rename to ubuntu_latest/blobs/sha256/900f32031c55c890a735d8c1d96eee1de593fab2d6216449c7ad6ffaf180d491
index 7a21f91..e4572cc 100644
--- a/ubuntu_latest/blobs/sha256/58db3edaf2be6e80f628796355b1bdeaf8bea1692b402f48b7e7b8d1ff100b02
+++ b/ubuntu_latest/blobs/sha256/900f32031c55c890a735d8c1d96eee1de593fab2d6216449c7ad6ffaf180d491
@@ -13,7 +13,7 @@
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
],
"Hostname": "",
- "Image": "sha256:269190441c1f8398e85a287ba6ac5568574f55bfcae7fb99bd253afad8cd8e69",
+ "Image": "sha256:a66299c0389644ff2c1034d2a102df324096f0c765a723844dc9e6d61ae7445a",
"Labels": {
"org.opencontainers.image.ref.name": "ubuntu",
"org.opencontainers.image.version": "22.04"
@@ -26,7 +26,7 @@
"Volumes": null,
"WorkingDir": ""
},
- "container": "6be7983e643200aa82c27e883bf03ae871243571f93a39f39d11dd3c79c96611",
+ "container": "11fcfcfbacd9d280d4ec8aa87fe73cc0e401f73535a9a89c683a9579d39af34e",
"container_config": {
"AttachStderr": false,
"AttachStdin": false,
@@ -42,8 +42,8 @@
"Env": [
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
],
- "Hostname": "6be7983e6432",
- "Image": "sha256:269190441c1f8398e85a287ba6ac5568574f55bfcae7fb99bd253afad8cd8e69",
+ "Hostname": "11fcfcfbacd9",
+ "Image": "sha256:a66299c0389644ff2c1034d2a102df324096f0c765a723844dc9e6d61ae7445a",
"Labels": {
"org.opencontainers.image.ref.name": "ubuntu",
"org.opencontainers.image.version": "22.04"
@@ -56,35 +56,35 @@
"Volumes": null,
"WorkingDir": ""
},
- "created": "2023-01-26T04:58:02.385638665Z",
+ "created": "2023-02-07T05:17:41.936852045Z",
"docker_version": "20.10.12",
"history": [
{
- "created": "2023-01-26T04:57:59.893830181Z",
+ "created": "2023-02-07T05:17:38.934107333Z",
"created_by": "/bin/sh -c #(nop) ARG RELEASE",
"empty_layer": true
},
{
- "created": "2023-01-26T04:57:59.959936538Z",
+ "created": "2023-02-07T05:17:39.00873391Z",
"created_by": "/bin/sh -c #(nop) ARG LAUNCHPAD_BUILD_ARCH",
"empty_layer": true
},
{
- "created": "2023-01-26T04:58:00.031088326Z",
+ "created": "2023-02-07T05:17:39.085722799Z",
"created_by": "/bin/sh -c #(nop) LABEL org.opencontainers.image.ref.name=ubuntu",
"empty_layer": true
},
{
- "created": "2023-01-26T04:58:00.098806406Z",
+ "created": "2023-02-07T05:17:39.16314988Z",
"created_by": "/bin/sh -c #(nop) LABEL org.opencontainers.image.version=22.04",
"empty_layer": true
},
{
- "created": "2023-01-26T04:58:02.097080644Z",
- "created_by": "/bin/sh -c #(nop) ADD file:18e71f049606f6339ce7a995839623f50e6ec6474bfd0a3a7ca799db726f47f6 in / "
+ "created": "2023-02-07T05:17:41.59591675Z",
+ "created_by": "/bin/sh -c #(nop) ADD file:6e0e77967e3b21095f5f0cc7678dba3a2e3eac858b56ff715a49197e7e2c0d61 in / "
},
{
- "created": "2023-01-26T04:58:02.385638665Z",
+ "created": "2023-02-07T05:17:41.936852045Z",
"created_by": "/bin/sh -c #(nop) CMD [\"/bin/bash\"]",
"empty_layer": true
}
@@ -92,7 +92,7 @@
"os": "linux",
"rootfs": {
"diff_ids": [
- "sha256:c5ff2d88f67954bdcf1cfdd46fe3d683858d69c2cadd6660812edfc83726c654"
+ "sha256:112883e5aa9f70593247ac71a27cddb8ecaaf6b84a118c236102bf5d842e04fc"
],
"type": "layers"
}
diff --git a/ubuntu_latest/blobs/sha256/677076032cca0a2362d25cf3660072e738d1b96fe860409a33ce901d695d7ee8 'tar -t' b/ubuntu_latest/blobs/sha256/a8e66b83353e066850f6f8a16c09f2f693ac1f2d2e9958bee178a935e66229e7 'tar -t'
similarity index 100%
rename from ubuntu_latest/blobs/sha256/677076032cca0a2362d25cf3660072e738d1b96fe860409a33ce901d695d7ee8 'tar -t'
rename to ubuntu_latest/blobs/sha256/a8e66b83353e066850f6f8a16c09f2f693ac1f2d2e9958bee178a935e66229e7 'tar -t'
diff --git a/ubuntu_devel/blobs/sha256/52293638ba652a2e8f9e1c1cfcc905839b1f2a9e671ddcc9bf77909b6bf527d0 b/ubuntu_latest/blobs/sha256/b3f52f418bc2af74d40666aca5f9ac1a7b7e88f7c31c26269db296035b4ae882
similarity index 26%
rename from ubuntu_devel/blobs/sha256/52293638ba652a2e8f9e1c1cfcc905839b1f2a9e671ddcc9bf77909b6bf527d0
rename to ubuntu_latest/blobs/sha256/b3f52f418bc2af74d40666aca5f9ac1a7b7e88f7c31c26269db296035b4ae882
index eea5aae..5f741dc 100644
--- a/ubuntu_devel/blobs/sha256/52293638ba652a2e8f9e1c1cfcc905839b1f2a9e671ddcc9bf77909b6bf527d0
+++ b/ubuntu_latest/blobs/sha256/b3f52f418bc2af74d40666aca5f9ac1a7b7e88f7c31c26269db296035b4ae882
@@ -1,14 +1,14 @@
{
"config": {
- "digest": "sha256:beb2152822b716b4deac2996f16bc84db0a14b7cbc549579635590438f9c0e1d",
- "mediaType": "application/vnd.oci.image.config.v1+json",
- "size": 2299
+ "digest": "sha256:900f32031c55c890a735d8c1d96eee1de593fab2d6216449c7ad6ffaf180d491",
+ "mediaType": "application/vnd.docker.container.image.v1+json",
+ "size": 2296
},
"layers": [
{
- "digest": "sha256:db781b8aed497363312ef32499cbfac28821e0494db7f0cadc4e716853e02a12",
- "mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
- "size": 26638886
+ "digest": "sha256:a8e66b83353e066850f6f8a16c09f2f693ac1f2d2e9958bee178a935e66229e7",
+ "mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
+ "size": 29528271
}
],
"mediaType": "application/vnd.oci.image.manifest.v1+json",
diff --git a/ubuntu_latest/index.json b/ubuntu_latest/index.json
index a347f11..af556c6 100644
--- a/ubuntu_latest/index.json
+++ b/ubuntu_latest/index.json
@@ -1,9 +1,9 @@
{
"manifests": [
{
- "digest": "sha256:c985bc3f77946b8e92c9a3648c6f31751a7dd972e06604785e47303f4ad47c4c",
+ "digest": "sha256:b3f52f418bc2af74d40666aca5f9ac1a7b7e88f7c31c26269db296035b4ae882",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
- "size": 424
+ "size": 436
}
],
"schemaVersion": 2Relevant Maintainers: |
|
Finally! 😂 |
|
Successful "Munge PR" run: https://github.com/docker-library/official-images/actions/runs/4188887136 + bashbrew build ubuntu:22.04
Building bashbrew/cache:82381497ce6db9acbbaadd2cc33547a61364337da7647afc83b1e42c0bcc40d1 (ubuntu:22.04)
failed oci-import build of "ubuntu" (tags "22.04, jammy-20230207, jammy, latest")
unsupported mediaType "application/vnd.docker.container.image.v1+json" for config descriptor "sha256:900f32031c55c890a735d8c1d96eee1de593fab2d6216449c7ad6ffaf180d491" (from directory "oci" in commit "7d7e89e020a975f43c39e8e4e27f724ba2e19a05")🥳 |
|
Did this in the wrong order, so GitHub stabbed me in the back. 😭 |
|
Ok @yosifkit, this is officially ready for review 🙈 |
yosifkit
approved these changes
Feb 17, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See also: