Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Ubuntu 2023-01-27 #13950

Merged
merged 1 commit into from
Jan 31, 2023
Merged

Conversation

ROCKsBot
Copy link

Update Ubuntu to latest published rootfs tarballs as of 2023-01-27.

Update Ubuntu to latest published rootfs tarballs as of 2023-01-27.
@ROCKsBot
Copy link
Author

/cc @woky @cjdcordeiro @mwhudson @toabctl

@cjdcordeiro
Copy link

@tianon we're migrating to the oci-import bashbrew builder, so I'm not sure if the failed check (diff-pr) is related to that. Maybe it's because this is the 1st commit of its type (i.e. there's no previous OCI-based build to compare with)

please advise
thanks ;)

@yosifkit
Copy link
Member

The error looks to be a problem in the diff-pr.sh script; it seems we haven't managed to adjust all our tooling quite yet for the oci-import builder. We are looking into it.

@cjdcordeiro
Copy link

thanks for the info @yosifkit . Please let me know if there's something we can do on our side to speed up the process.

@ROCKsBot ROCKsBot marked this pull request as ready for review January 30, 2023 08:00
@tianon
Copy link
Member

tianon commented Jan 30, 2023

Sorry, I was out on Friday. 🙇

The script changes aren't 100% ready (#13968), but here's something that gives us a decent delta:

Diff:
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 <[email protected]> (@woky), Tianon Gravi <[email protected]> (@tianon), Michael Hudson-Doyle <[email protected]> (@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

@tianon tianon merged commit 846a527 into docker-library:master Jan 31, 2023
@tianon
Copy link
Member

tianon commented Jan 31, 2023

Let's do this 😄

@cjdcordeiro
Copy link

Nice thanks!

I was hoping the image digests would've been the same as all the other ubuntu images we are self-publishing to other registries since the OCI source is the same.

Taking the jammy tag as an example, even when I run bashbrew locally, I get:

$ bashbrew build ./ubuntu:jammy  
Building bashbrew/cache:8b9b18392f3f44d106a60294e3b0f72775fe2c6c1ba1c913b5015435b251c105 (ubuntu:22.04)
Importing ubuntu:22.04 into Docker
Loaded image: ubuntu:22.04
Loaded image: ubuntu:jammy-20230126
Loaded image: ubuntu:jammy
Loaded image: ubuntu:latest

$ bashbrew push ./ubuntu:jammy  --target-namespace ccordeiro
Pushing sha256:eecba05a9ccbc219cb0f0dd280034c6ee1aab0b00b458e680f9c4efc6ca3feda to ccordeiro/ubuntu:22.04, ccordeiro/ubuntu:jammy-20230126, ccordeiro/ubuntu:jammy, ccordeiro/ubuntu:latest

This shows the digest being eecba05a9ccbc219cb0f0dd280034c6ee1aab0b00b458e680f9c4efc6ca3feda, which is accurate and in sync with all the other Jammy digests in other registries. So I wonder why this tag ended up with the digest 965fbcae990b0467ed5657caceaec165018ef44a4d2d46c7cdea80a9dff0d1ea in Docker Hub?

@cjdcordeiro
Copy link

update

Well, the difference in the digest is also related to the fact that the Jammy image (and probably also others) has the wrong content!

how to reproduce

Source:

$ grep jammy-amd64 official-images/library/ubuntu
# https://git.launchpad.net/cloud-images/+oci/ubuntu-base/tree/?h=dist-jammy-amd64-20230126
amd64-GitFetch: refs/tags/dist-jammy-amd64-20230126
$
$ git ls-remote upstream refs/tags/dist-jammy-amd64-20230126
c59419b8a85cb1d938e73e83af8f8e6ff4110444        refs/tags/dist-jammy-amd64-20230126
$
$ git ls-tree -l dist-jammy-amd64-20230126 oci/blobs/sha256/
100644 blob 636cbe54181cc7b9c17faa32fda5723289d6d7b0    2299    oci/blobs/sha256/58db3edaf2be6e80f628796355b1bdeaf8bea1692b402f48b7e7b8d1ff100b02
100644 blob 5f9d9c06cfce5e55809838ed6dd2bbe80ca1b0cb 29528717   oci/blobs/sha256/677076032cca0a2362d25cf3660072e738d1b96fe860409a33ce901d695d7ee8
100644 blob ed1b165ee606d67d264ad96486e04860fae5d133     436    oci/blobs/sha256/eecba05a9ccbc219cb0f0dd280034c6ee1aab0b00b458e680f9c4efc6ca3feda

Remote:

$ skopeo copy --preserve-digests docker://ubuntu:jammy oci:remote-jammy
Getting image source signatures
Copying blob 6e3729cf69e0 done  
Copying config 6b7dfa7e8f done  
Writing manifest to image destination
Storing signatures
$
$ ls -l remote-jammy/blobs/sha256/
total 29724
-rw-r--r-- 1 cris cris     1463 Jan 31 11:07 6b7dfa7e8fdbe18ad425dd965a1049d984f31cf0ad57fa6d5377cca355e65f03
-rw-r--r-- 1 cris cris 30428708 Jan 31 11:07 6e3729cf69e0ce2de9e779575a1fec8b7fb5efdfa822829290ab6d5d1bc3e797
-rw-r--r-- 1 cris cris      529 Jan 31 11:07 965fbcae990b0467ed5657caceaec165018ef44a4d2d46c7cdea80a9dff0d1ea

You can see the blobs are not the same. An even easier way to confirm this discrepancy is by looking up the file /etc/cloud/build.info inside the image (we've recently added it to all supported tags):

$ docker run --rm ubuntu:jammy cat /etc/cloud/build.info
cat: /etc/cloud/build.info: No such file or directory
$
$ docker run --rm public.ecr.aws/ubuntu/ubuntu:jammy cat /etc/cloud/build.info
serial: 20230126

@tianon
Copy link
Member

tianon commented Jan 31, 2023

The update failed to push due to some build pipeline issues -- I'm looking into it. 🙇

@tianon
Copy link
Member

tianon commented Jan 31, 2023

Ok, it should be fixed now. 🙇

(This dropped riscv64 support intentionally, right?)

@tianon
Copy link
Member

tianon commented Jan 31, 2023

FYI #13983 (not sure what the deal there is, but including for visibility)

@tianon
Copy link
Member

tianon commented Jan 31, 2023

Doh, now I see what's wrong here -- we need to increase our validation.

The container is using the OCI media type for the manifest, but the objects inside (config and layer blob) are using Docker media types, and Docker is apparently more forgiving than other runtimes about the envelope and contents matching.

@tianon
Copy link
Member

tianon commented Jan 31, 2023

I would suggest we either update these media types to be OCI or revert this and try again once it's fixed. 😅

@tianon
Copy link
Member

tianon commented Jan 31, 2023

(in the meantime, I'm looking at updating bashbrew to catch this in the future)

@paleozogt
Copy link

@tianon Can you revert this change? It's seriously borked up our systems that were pulling from the official ubuntu registry on Docker Hub.

@cjdcordeiro
Copy link

Doh, now I see what's wrong here -- we need to increase our validation.

The container is using the OCI media type for the manifest, but the objects inside (config and layer blob) are using Docker media types, and Docker is apparently more forgiving than other runtimes about the envelope and contents matching.

yes, that's exactly it. Our CI passed as well cause Docker seemed to be ok with it. We already have a fix for it and are now building new images. a new PR is coming later today

@cjdcordeiro
Copy link

@tianon there's a new PR at #13988

@cjdcordeiro
Copy link

cjdcordeiro commented Feb 1, 2023

Ok, it should be fixed now. bow

(This dropped riscv64 support intentionally, right?)

yes ;) for now, but we might bring it back (talking about it)

@tianon
Copy link
Member

tianon commented Feb 1, 2023

Thanks @cjdcordeiro 🙇 ❤️

FYI to affected image maintainers: (no more ubuntu:xenial/ubuntu:16.04 -- please either update your base or drop the offending tags from the supported list)

@cjdcordeiro
Copy link

Thanks @cjdcordeiro bow heart

FYI to affected image maintainers: (no more ubuntu:xenial/ubuntu:16.04 -- please either update your base or drop the offending tags from the supported list)

Indeed. Xenial has entered ESM. The current Xenial image here will only be updated under exceptional circumstances (i.e. not regularly like the currently supported ones - bionic, focal, jammy, kinetic and lunar).

On that note, here's another early heads up for EOL on:

  • kinetic, end of July 2023
  • bionic, end of May 2023

@tianon
Copy link
Member

tianon commented Feb 2, 2023

Indeed. Xenial has entered ESM. The current Xenial image here will only be updated under exceptional circumstances (i.e. not regularly like the currently supported ones - bionic, focal, jammy, kinetic and lunar).

On that note, here's another early heads up for EOL on:

  • kinetic, end of July 2023
  • bionic, end of May 2023

👀 ❣️

FYI to affected image maintainers:

@ceejatec
Copy link
Contributor

ceejatec commented Feb 3, 2023

@tianon As one the above-tagged maintainers, what actions should I be taking here? It appears one older version of our product has a Dockerfile based on ubuntu:18.04, and that version doesn't support Ubuntu 20 so we can't just switch the base image. If we just leave it alone, what will happen?

@tianon
Copy link
Member

tianon commented Feb 3, 2023

Once it reaches EOL and is no longer supported, we will ask you to either update your base or drop the versions from the supported list (because we will no longer be able to rebuild it with base image updates to pull in updated packages especially for security fixes which will no longer be coming).

@gdams
Copy link
Contributor

gdams commented Mar 15, 2024

yes ;) for now, but we might bring it back (talking about it)

@cjdcordeiro is there any chance of a riscv64 image returning? The eclipse-temurin image would like to add support for riscv64 but we're blocked until we have an ubuntu release

@cjdcordeiro
Copy link

cjdcordeiro commented Apr 4, 2024

hi @gdams . we've made some progress and are not now able to re-build those images again. But we're experiencing some problems with the reliability of those builds. We'll be revisiting this topic in May 🤞

@gdams
Copy link
Contributor

gdams commented Apr 4, 2024

hi @gdams . we've made some progress and are not able to re-build those images again. But we're experiencing some problems with the reliability of those builds. We'll be revisiting this topic in May 🤞

Sounds good! Guessing you mean you are "now" able to rebuild those images again? Good news regardless! I'll keep an eye out

@cjdcordeiro
Copy link

oh y, typo, sry (fixed)

@yosifkit yosifkit mentioned this pull request Jul 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants