Fix base image names.

Alexhuszagh · Alexhuszagh · commit 2e4db62e48b2 · 2022-10-04T17:45:16.000-05:00
diff --git a/docker/Dockerfile.aarch64-linux-android b/docker/Dockerfile.aarch64-linux-android
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY android-ndk.sh /
diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu b/docker/Dockerfile.aarch64-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu.centos b/docker/Dockerfile.aarch64-unknown-linux-gnu.centos
@@ -6,7 +6,7 @@ COPY lib.sh /
 COPY linux-image.sh /
 RUN /linux-image.sh aarch64
 
-FROM ghcr.io/cross-rs/base:centos-main
+FROM ghcr.io/cross-rs/base:main-centos
 
 COPY qemu.sh /
 RUN /qemu.sh aarch64 softmmu
diff --git a/docker/Dockerfile.aarch64-unknown-linux-musl b/docker/Dockerfile.aarch64-unknown-linux-musl
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY qemu.sh /
diff --git a/docker/Dockerfile.arm-linux-androideabi b/docker/Dockerfile.arm-linux-androideabi
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY android-ndk.sh /
diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabi b/docker/Dockerfile.arm-unknown-linux-gnueabi
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabihf b/docker/Dockerfile.arm-unknown-linux-gnueabihf
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 ARG VERBOSE
diff --git a/docker/Dockerfile.arm-unknown-linux-musleabi b/docker/Dockerfile.arm-unknown-linux-musleabi
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY qemu.sh /
diff --git a/docker/Dockerfile.arm-unknown-linux-musleabihf b/docker/Dockerfile.arm-unknown-linux-musleabihf
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY qemu.sh /
diff --git a/docker/Dockerfile.armv5te-unknown-linux-gnueabi b/docker/Dockerfile.armv5te-unknown-linux-gnueabi
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.armv5te-unknown-linux-musleabi b/docker/Dockerfile.armv5te-unknown-linux-musleabi
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY qemu.sh /
diff --git a/docker/Dockerfile.armv7-linux-androideabi b/docker/Dockerfile.armv7-linux-androideabi
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY android-ndk.sh /
diff --git a/docker/Dockerfile.armv7-unknown-linux-gnueabi b/docker/Dockerfile.armv7-unknown-linux-gnueabi
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.armv7-unknown-linux-gnueabihf b/docker/Dockerfile.armv7-unknown-linux-gnueabihf
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.armv7-unknown-linux-musleabi b/docker/Dockerfile.armv7-unknown-linux-musleabi
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY qemu.sh /
diff --git a/docker/Dockerfile.armv7-unknown-linux-musleabihf b/docker/Dockerfile.armv7-unknown-linux-musleabihf
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY qemu.sh /
diff --git a/docker/Dockerfile.asmjs-unknown-emscripten b/docker/Dockerfile.asmjs-unknown-emscripten
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:emscripten-main
+FROM ghcr.io/cross-rs/base:main-emscripten
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.i586-unknown-linux-gnu b/docker/Dockerfile.i586-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.i586-unknown-linux-musl b/docker/Dockerfile.i586-unknown-linux-musl
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY musl.sh /
diff --git a/docker/Dockerfile.i686-linux-android b/docker/Dockerfile.i686-linux-android
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY android-ndk.sh /
diff --git a/docker/Dockerfile.i686-pc-windows-gnu b/docker/Dockerfile.i686-pc-windows-gnu
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN dpkg --add-architecture i386 && apt-get update && \
diff --git a/docker/Dockerfile.i686-unknown-freebsd b/docker/Dockerfile.i686-unknown-freebsd
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN echo "export ARCH=i686" > /freebsd-arch.sh
diff --git a/docker/Dockerfile.i686-unknown-linux-gnu b/docker/Dockerfile.i686-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.i686-unknown-linux-musl b/docker/Dockerfile.i686-unknown-linux-musl
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY musl.sh /
diff --git a/docker/Dockerfile.mips-unknown-linux-gnu b/docker/Dockerfile.mips-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.mips-unknown-linux-musl b/docker/Dockerfile.mips-unknown-linux-musl
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY qemu.sh /
diff --git a/docker/Dockerfile.mips64-unknown-linux-gnuabi64 b/docker/Dockerfile.mips64-unknown-linux-gnuabi64
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.mips64-unknown-linux-muslabi64 b/docker/Dockerfile.mips64-unknown-linux-muslabi64
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY qemu.sh /
diff --git a/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 b/docker/Dockerfile.mips64el-unknown-linux-gnuabi64
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.mips64el-unknown-linux-muslabi64 b/docker/Dockerfile.mips64el-unknown-linux-muslabi64
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY qemu.sh /
diff --git a/docker/Dockerfile.mipsel-unknown-linux-gnu b/docker/Dockerfile.mipsel-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.mipsel-unknown-linux-musl b/docker/Dockerfile.mipsel-unknown-linux-musl
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY qemu.sh /
diff --git a/docker/Dockerfile.powerpc-unknown-linux-gnu b/docker/Dockerfile.powerpc-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.powerpc64-unknown-linux-gnu b/docker/Dockerfile.powerpc64-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.powerpc64le-unknown-linux-gnu b/docker/Dockerfile.powerpc64le-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.riscv64gc-unknown-linux-gnu b/docker/Dockerfile.riscv64gc-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/docker/Dockerfile.s390x-unknown-linux-gnu b/docker/Dockerfile.s390x-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.sparc64-unknown-linux-gnu b/docker/Dockerfile.sparc64-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.sparcv9-sun-solaris b/docker/Dockerfile.sparcv9-sun-solaris
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY solaris.sh /
diff --git a/docker/Dockerfile.thumbv6m-none-eabi b/docker/Dockerfile.thumbv6m-none-eabi
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY qemu.sh /
diff --git a/docker/Dockerfile.thumbv7em-none-eabi b/docker/Dockerfile.thumbv7em-none-eabi
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY qemu.sh /
diff --git a/docker/Dockerfile.thumbv7em-none-eabihf b/docker/Dockerfile.thumbv7em-none-eabihf
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY qemu.sh /
diff --git a/docker/Dockerfile.thumbv7m-none-eabi b/docker/Dockerfile.thumbv7m-none-eabi
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY qemu.sh /
diff --git a/docker/Dockerfile.thumbv7neon-linux-androideabi b/docker/Dockerfile.thumbv7neon-linux-androideabi
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY android-ndk.sh /
diff --git a/docker/Dockerfile.thumbv7neon-unknown-linux-gnueabihf b/docker/Dockerfile.thumbv7neon-unknown-linux-gnueabihf
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.wasm32-unknown-emscripten b/docker/Dockerfile.wasm32-unknown-emscripten
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:emscripten-main
+FROM ghcr.io/cross-rs/base:main-emscripten
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
diff --git a/docker/Dockerfile.x86_64-linux-android b/docker/Dockerfile.x86_64-linux-android
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY android-ndk.sh /
diff --git a/docker/Dockerfile.x86_64-pc-windows-gnu b/docker/Dockerfile.x86_64-pc-windows-gnu
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN dpkg --add-architecture i386 && apt-get update && \
diff --git a/docker/Dockerfile.x86_64-sun-solaris b/docker/Dockerfile.x86_64-sun-solaris
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY solaris.sh /
diff --git a/docker/Dockerfile.x86_64-unknown-dragonfly b/docker/Dockerfile.x86_64-unknown-dragonfly
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY dragonfly.sh /
diff --git a/docker/Dockerfile.x86_64-unknown-freebsd b/docker/Dockerfile.x86_64-unknown-freebsd
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN echo "export ARCH=x86_64" > /freebsd-arch.sh
diff --git a/docker/Dockerfile.x86_64-unknown-illumos b/docker/Dockerfile.x86_64-unknown-illumos
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY illumos.sh /
diff --git a/docker/Dockerfile.x86_64-unknown-linux-gnu b/docker/Dockerfile.x86_64-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY qemu.sh /
diff --git a/docker/Dockerfile.x86_64-unknown-linux-gnu.centos b/docker/Dockerfile.x86_64-unknown-linux-gnu.centos
@@ -5,7 +5,7 @@ COPY lib.sh /
 COPY linux-image.sh /
 RUN /linux-image.sh x86_64
 
-FROM ghcr.io/cross-rs/base:centos-main
+FROM ghcr.io/cross-rs/base:main-centos
 
 COPY qemu.sh /
 RUN /qemu.sh x86_64 softmmu
diff --git a/docker/Dockerfile.x86_64-unknown-linux-musl b/docker/Dockerfile.x86_64-unknown-linux-musl
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY musl.sh /
diff --git a/docker/Dockerfile.x86_64-unknown-netbsd b/docker/Dockerfile.x86_64-unknown-netbsd
@@ -1,4 +1,4 @@
-FROM ghcr.io/cross-rs/base:ubuntu-main
+FROM ghcr.io/cross-rs/base:main-ubuntu
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY netbsd.sh /

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ghcr.io/cross-rs/base:ubuntu-main`
	`1`	`+FROM ghcr.io/cross-rs/base:main-ubuntu`
`2`	`2`	`ARG DEBIAN_FRONTEND=noninteractive`
`3`	`3`
`4`	`4`	`COPY android-ndk.sh /`