From e76f24e120135f3a98aa5888c91a10153a095328 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Tue, 21 Jun 2022 19:22:47 -0400 Subject: [PATCH] Anticipate update renaming common.manylinux to common.manylinux2014 --- Makefile | 4 ++-- common/{common.manylinux => common.manylinux2014} | 0 manylinux2014-x64/Dockerfile.in | 2 +- manylinux2014-x86/Dockerfile.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename common/{common.manylinux => common.manylinux2014} (100%) diff --git a/Makefile b/Makefile index b8f1cbf..0e18119 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ NON_STANDARD_IMAGES = manylinux2014-x64 manylinux2014-x86 \ manylinux2014-aarch64 web-wasm # Docker composite files -DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.buildroot \ +DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux2014 common.buildroot \ common.crosstool common.webassembly common.windows common-manylinux.crosstool common.dockcross \ common.label-and-env DOCKER_COMPOSITE_FOLDER_PATH = common/ @@ -98,7 +98,7 @@ $(GEN_IMAGE_DOCKERFILES) Dockerfile: %Dockerfile: %Dockerfile.in $(DOCKER_COMPOS sed \ -e '/common.docker/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.docker' \ -e '/common.debian/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.debian' \ - -e '/common.manylinux/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.manylinux' \ + -e '/common.manylinux2014/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.manylinux2014' \ -e '/common.crosstool/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.crosstool' \ -e '/common.buildroot/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.buildroot' \ -e '/common-manylinux.crosstool/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common-manylinux.crosstool' \ diff --git a/common/common.manylinux b/common/common.manylinux2014 similarity index 100% rename from common/common.manylinux rename to common/common.manylinux2014 diff --git a/manylinux2014-x64/Dockerfile.in b/manylinux2014-x64/Dockerfile.in index 51e0a15..93c3d0a 100644 --- a/manylinux2014-x64/Dockerfile.in +++ b/manylinux2014-x64/Dockerfile.in @@ -5,7 +5,7 @@ LABEL maintainer="Matt McCormick matt.mccormick@kitware.com" ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2014-x64 -#include "common.manylinux" +#include "common.manylinux2014" #include "common.dockcross" diff --git a/manylinux2014-x86/Dockerfile.in b/manylinux2014-x86/Dockerfile.in index 1716c84..566960f 100644 --- a/manylinux2014-x86/Dockerfile.in +++ b/manylinux2014-x86/Dockerfile.in @@ -5,7 +5,7 @@ LABEL maintainer="Matt McCormick matt.mccormick@kitware.com" ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2014-x86 -#include "common.manylinux" +#include "common.manylinux2014" #include "common.dockcross"