Skip to content

Move Launchpad references to my temp GitHub for now #26

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 16, 2024
Merged

Move Launchpad references to my temp GitHub for now #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .test/builds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2737,7 +2737,7 @@
"ubuntu:latest"
],
"entry": {
"GitRepo": "https://git.launchpad.net/cloud-images/+oci/ubuntu-base",
"GitRepo": "https://github.com/tianon/temp.git",
"GitFetch": "refs/tags/dist-jammy-amd64-20240111-e6e3490a",
"GitCommit": "e6e3490ad3f524ccaa072edafe525f8ca8ac5490",
"Directory": "oci",
Expand Down
4 changes: 2 additions & 2 deletions .test/example-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ git init --bare "$gitCache"
_git() { git -C "$gitCache" "$@"; }
_git config gc.auto 0
_commit() { _git rev-parse 'e6e3490ad3f524ccaa072edafe525f8ca8ac5490^{commit}'; }
if ! _commit &> /dev/null; then _git fetch 'https://git.launchpad.net/cloud-images/+oci/ubuntu-base' 'e6e3490ad3f524ccaa072edafe525f8ca8ac5490:' || _git fetch 'refs/tags/dist-jammy-amd64-20240111-e6e3490a:'; fi
if ! _commit &> /dev/null; then _git fetch 'https://github.com/tianon/temp.git' 'e6e3490ad3f524ccaa072edafe525f8ca8ac5490:' || _git fetch 'refs/tags/dist-jammy-amd64-20240111-e6e3490a:'; fi
_commit
mkdir temp
_git archive --format=tar 'e6e3490ad3f524ccaa072edafe525f8ca8ac5490:oci/' | tar -xvC temp
Expand Down Expand Up @@ -121,7 +121,7 @@ jq -s '
error("invalid descriptor size: " + .size)
else . end
| del(.annotations, .urls)
| .annotations = {"org.opencontainers.image.source":"https://git.launchpad.net/cloud-images/+oci/ubuntu-base","org.opencontainers.image.revision":"e6e3490ad3f524ccaa072edafe525f8ca8ac5490","org.opencontainers.image.created":"2024-01-11T00:00:00Z","org.opencontainers.image.version":"22.04","org.opencontainers.image.url":"https://hub.docker.com/_/ubuntu","com.docker.official-images.bashbrew.arch":"amd64","org.opencontainers.image.base.name":"scratch"}
| .annotations = {"org.opencontainers.image.source":"https://github.com/tianon/temp.git","org.opencontainers.image.revision":"e6e3490ad3f524ccaa072edafe525f8ca8ac5490","org.opencontainers.image.created":"2024-01-11T00:00:00Z","org.opencontainers.image.version":"22.04","org.opencontainers.image.url":"https://hub.docker.com/_/ubuntu","com.docker.official-images.bashbrew.arch":"amd64","org.opencontainers.image.base.name":"scratch"}
)
' temp/index.json > temp/index.json.new
mv temp/index.json.new temp/index.json
Expand Down
4 changes: 3 additions & 1 deletion .test/library/ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# https://github.com/docker-library/official-images/blob/fe9c059402181390eac083cbdd7229b5d123236e/library/ubuntu but intentionally slimmed down (just "latest" on one architecture, no email addresses)
# ... https://github.com/docker-library/meta-scripts/issues/25 (moved to GitHub because Launchpad won't give us old commits)

Maintainers: Tomáš Virtus (@woky), Cristóvão Cordeiro (@cjdcordeiro)
GitRepo: https://git.launchpad.net/cloud-images/+oci/ubuntu-base
#GitRepo: https://git.launchpad.net/cloud-images/+oci/ubuntu-base
GitRepo: https://github.com/tianon/temp.git
GitCommit: fa42be9027eccb928a1f0f43d95ffd9a45d36737
Builder: oci-import
File: index.json
Expand Down
2 changes: 1 addition & 1 deletion .test/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@
"ubuntu:latest"
],
"entry": {
"GitRepo": "https://git.launchpad.net/cloud-images/+oci/ubuntu-base",
"GitRepo": "https://github.com/tianon/temp.git",
"GitFetch": "refs/tags/dist-jammy-amd64-20240111-e6e3490a",
"GitCommit": "e6e3490ad3f524ccaa072edafe525f8ca8ac5490",
"Directory": "oci",
Expand Down