Skip to content

Commit 9ce03d9

Browse files
rnavmpe
authored andcommitted
Dis-ambiguate the container registry to pull images from
Podman requires the user to be explicit about the container registry from which to pull an image from. In the default setup, trying to pull the linuxppc build container throws the below error: $ make pull-image@ppc64le@ubuntu@21.10 + podman pull linuxppc/build:ubuntu-21.10-x86_64 Error: short-name "linuxppc/build:ubuntu-21.10-x86_64" did not resolve to an alias and no unqualified-search registries are defined in "/etc/containers/registries.conf" Error: pulling linuxppc/build:ubuntu-21.10? While users can setup the docker hub as the default unqualified search registry, it is easier to simply be explicit about the registry in the first place. Prefix all images with docker.io for this purpose.
1 parent 8c81e1e commit 9ce03d9

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

build/scripts/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ script_base="$(realpath "$dir")"
1717

1818
IFS=@ read -r task subarch distro version <<< "$1"
1919

20-
image="linuxppc/build:$distro-$version"
20+
image="docker.io/linuxppc/build:$distro-$version"
2121

2222
SRC="${SRC/#\~/$HOME}"
2323
SRC=$(realpath "$SRC")

build/scripts/image.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ script_base="$(realpath "$dir")"
1111

1212
IFS=@ read -r task subarch distro version <<< "$1"
1313

14-
image="linuxppc/build:$distro-$version"
14+
image="docker.io/linuxppc/build:$distro-$version"
1515

1616
if [[ "$task" == "image" ]]; then
1717
cmd="$DOCKER images -q --filter=reference=$image"
@@ -64,10 +64,10 @@ if [[ -z "$GID" ]]; then
6464
GID=$(id -g)
6565
fi
6666

67-
from="$distro:$version"
67+
from="docker.io/$distro:$version"
6868

6969
if [[ "$distro" == "docs" ]]; then
70-
from="ubuntu:$version"
70+
from="docker.io/ubuntu:$version"
7171
elif [[ "$distro" == "korg" ]]; then
7272
cmd+="--build-arg compiler_version=$version "
7373

@@ -78,9 +78,9 @@ elif [[ "$distro" == "korg" ]]; then
7878

7979
# Use an older distro for the 5.x toolchains.
8080
if [[ "$version" == 5.* ]]; then
81-
from="ubuntu:16.04"
81+
from="docker.io/ubuntu:16.04"
8282
else
83-
from="ubuntu:20.04"
83+
from="docker.io/ubuntu:20.04"
8484
fi
8585
fi
8686

0 commit comments

Comments
 (0)