mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Removal of TEST_IMAGE_NAMESPACE
We don't need the test image namespace anymore since we've already upgrade those images to the latest multi-arch ones. Signed-off-by: Dennis Chen <dennis.chen@arm.com>
This commit is contained in:
parent
eaae7750ef
commit
662bdb4a56
3 changed files with 1 additions and 10 deletions
|
@ -53,7 +53,6 @@ esac
|
|||
export PACKAGE_ARCH
|
||||
|
||||
DOCKERFILE='Dockerfile'
|
||||
TEST_IMAGE_NAMESPACE=
|
||||
case "$PACKAGE_ARCH" in
|
||||
amd64)
|
||||
case "${DOCKER_ENGINE_GOOS:-$DOCKER_CLIENT_GOOS}" in
|
||||
|
@ -64,9 +63,6 @@ case "$PACKAGE_ARCH" in
|
|||
;;
|
||||
*)
|
||||
DOCKERFILE="Dockerfile.$PACKAGE_ARCH"
|
||||
if [ "$PACKAGE_ARCH" != "aarch64" ]; then
|
||||
TEST_IMAGE_NAMESPACE="$PACKAGE_ARCH"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
export DOCKERFILE TEST_IMAGE_NAMESPACE
|
||||
export DOCKERFILE
|
||||
|
|
|
@ -99,7 +99,6 @@ test_env() {
|
|||
HOME="$ABS_DEST/fake-HOME" \
|
||||
PATH="$PATH" \
|
||||
TEMP="$TEMP" \
|
||||
TEST_IMAGE_NAMESPACE="$TEST_IMAGE_NAMESPACE" \
|
||||
TEST_CLIENT_BINARY="$TEST_CLIENT_BINARY" \
|
||||
"$@"
|
||||
)
|
||||
|
|
|
@ -26,7 +26,6 @@ const frozenImgDir = "/docker-frozen-images"
|
|||
// images were passed in. If the images need to be downloaded, then it will respect
|
||||
// the passed in images
|
||||
func FrozenImagesLinux(client client.APIClient, images ...string) error {
|
||||
imgNS := os.Getenv("TEST_IMAGE_NAMESPACE")
|
||||
var loadImages []struct{ srcName, destName string }
|
||||
for _, img := range images {
|
||||
if !imageExists(client, img) {
|
||||
|
@ -38,9 +37,6 @@ func FrozenImagesLinux(client client.APIClient, images ...string) error {
|
|||
if img == "hello-world:frozen" {
|
||||
srcName = "hello-world:latest"
|
||||
}
|
||||
if imgNS != "" {
|
||||
srcName = imgNS + "/" + srcName
|
||||
}
|
||||
loadImages = append(loadImages, struct{ srcName, destName string }{
|
||||
srcName: srcName,
|
||||
destName: img,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue