From 1fb2785377819d4c31c67e13ac7c8ea65efee082 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Wed, 6 May 2020 20:09:51 -0400 Subject: [PATCH] Rename Dockerfile to Dockerfile.in to ensure consistency All Dockerfiles are now configured similarly, this will support future improvements. --- Makefile | 2 +- android-arm/{Dockerfile => Dockerfile.in} | 0 android-arm64/{Dockerfile => Dockerfile.in} | 0 linux-armv6/{Dockerfile => Dockerfile.in} | 0 linux-mipsel/{Dockerfile => Dockerfile.in} | 0 linux-x64/{Dockerfile => Dockerfile.in} | 0 linux-x86/{Dockerfile => Dockerfile.in} | 0 7 files changed, 1 insertion(+), 1 deletion(-) rename android-arm/{Dockerfile => Dockerfile.in} (100%) rename android-arm64/{Dockerfile => Dockerfile.in} (100%) rename linux-armv6/{Dockerfile => Dockerfile.in} (100%) rename linux-mipsel/{Dockerfile => Dockerfile.in} (100%) rename linux-x64/{Dockerfile => Dockerfile.in} (100%) rename linux-x86/{Dockerfile => Dockerfile.in} (100%) diff --git a/Makefile b/Makefile index d9caa7d..205360a 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ BIN = ./bin STANDARD_IMAGES = linux-s390x android-arm android-arm64 android-x86 android-x86_64 linux-x86 linux-x64 linux-arm64 linux-arm64-musl linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl linux-mips linux-mipsel linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix # Generated Dockerfiles. -GEN_IMAGES = linux-s390x linux-mips manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv7l-musl linux-armv6-musl linux-armv5 linux-armv5-musl linux-ppc64le +GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-mipsel manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv7l-musl linux-armv6 linux-armv6-musl linux-armv5 linux-armv5-musl linux-ppc64le GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES)) # These images are expected to have explicit rules for *both* build and testing diff --git a/android-arm/Dockerfile b/android-arm/Dockerfile.in similarity index 100% rename from android-arm/Dockerfile rename to android-arm/Dockerfile.in diff --git a/android-arm64/Dockerfile b/android-arm64/Dockerfile.in similarity index 100% rename from android-arm64/Dockerfile rename to android-arm64/Dockerfile.in diff --git a/linux-armv6/Dockerfile b/linux-armv6/Dockerfile.in similarity index 100% rename from linux-armv6/Dockerfile rename to linux-armv6/Dockerfile.in diff --git a/linux-mipsel/Dockerfile b/linux-mipsel/Dockerfile.in similarity index 100% rename from linux-mipsel/Dockerfile rename to linux-mipsel/Dockerfile.in diff --git a/linux-x64/Dockerfile b/linux-x64/Dockerfile.in similarity index 100% rename from linux-x64/Dockerfile rename to linux-x64/Dockerfile.in diff --git a/linux-x86/Dockerfile b/linux-x86/Dockerfile.in similarity index 100% rename from linux-x86/Dockerfile rename to linux-x86/Dockerfile.in