Skip to content

Commit 2523842

Browse files
authored
Merge pull request #26 from infosiftr/lunchpad
Move Launchpad references to my temp GitHub for now
2 parents 88a9541 + ec67578 commit 2523842

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

.test/builds.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2737,7 +2737,7 @@
27372737
"ubuntu:latest"
27382738
],
27392739
"entry": {
2740-
"GitRepo": "https://git.launchpad.net/cloud-images/+oci/ubuntu-base",
2740+
"GitRepo": "https://github.com/tianon/temp.git",
27412741
"GitFetch": "refs/tags/dist-jammy-amd64-20240111-e6e3490a",
27422742
"GitCommit": "e6e3490ad3f524ccaa072edafe525f8ca8ac5490",
27432743
"Directory": "oci",

.test/example-commands.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ git init --bare "$gitCache"
9191
_git() { git -C "$gitCache" "$@"; }
9292
_git config gc.auto 0
9393
_commit() { _git rev-parse 'e6e3490ad3f524ccaa072edafe525f8ca8ac5490^{commit}'; }
94-
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
94+
if ! _commit &> /dev/null; then _git fetch 'https://github.com/tianon/temp.git' 'e6e3490ad3f524ccaa072edafe525f8ca8ac5490:' || _git fetch 'refs/tags/dist-jammy-amd64-20240111-e6e3490a:'; fi
9595
_commit
9696
mkdir temp
9797
_git archive --format=tar 'e6e3490ad3f524ccaa072edafe525f8ca8ac5490:oci/' | tar -xvC temp
@@ -121,7 +121,7 @@ jq -s '
121121
error("invalid descriptor size: " + .size)
122122
else . end
123123
| del(.annotations, .urls)
124-
| .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"}
124+
| .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"}
125125
)
126126
' temp/index.json > temp/index.json.new
127127
mv temp/index.json.new temp/index.json

.test/library/ubuntu

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# https://github.com/docker-library/official-images/blob/fe9c059402181390eac083cbdd7229b5d123236e/library/ubuntu but intentionally slimmed down (just "latest" on one architecture, no email addresses)
2+
# ... https://github.com/docker-library/meta-scripts/issues/25 (moved to GitHub because Launchpad won't give us old commits)
23

34
Maintainers: Tomáš Virtus (@woky), Cristóvão Cordeiro (@cjdcordeiro)
4-
GitRepo: https://git.launchpad.net/cloud-images/+oci/ubuntu-base
5+
#GitRepo: https://git.launchpad.net/cloud-images/+oci/ubuntu-base
6+
GitRepo: https://github.com/tianon/temp.git
57
GitCommit: fa42be9027eccb928a1f0f43d95ffd9a45d36737
68
Builder: oci-import
79
File: index.json

.test/sources.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@
768768
"ubuntu:latest"
769769
],
770770
"entry": {
771-
"GitRepo": "https://git.launchpad.net/cloud-images/+oci/ubuntu-base",
771+
"GitRepo": "https://github.com/tianon/temp.git",
772772
"GitFetch": "refs/tags/dist-jammy-amd64-20240111-e6e3490a",
773773
"GitCommit": "e6e3490ad3f524ccaa072edafe525f8ca8ac5490",
774774
"Directory": "oci",

0 commit comments

Comments
 (0)