[GitHub] larroy closed pull request #12423: Rename Dockerfile.build.* -> Dockerfile.*

[GitBox <gi...@apache.org>]

larroy closed pull request #12423: Rename Dockerfile.build.* -> Dockerfile.*
URL: https://github.com/apache/incubator-mxnet/pull/12423
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/ci/README.md b/ci/README.md
index 69308756943..855cefbb52e 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -76,7 +76,7 @@ verifying that the container stops shortly afterwards by running docker ps.
 ## Add a platform
 
 To add a platform, you should add the appropriate dockerfile in
-docker/Dockerfile.build.<platform> and add a shell function named
+docker/Dockerfile.<platform> and add a shell function named
 build_<platform> to the file docker/runtime_functions.sh with build
 instructions for that platform.
 
diff --git a/ci/build.py b/ci/build.py
index b7c86adda71..0aa7419849a 100755
--- a/ci/build.py
+++ b/ci/build.py
@@ -92,20 +92,19 @@ def get_dockerfiles_path():
 
 def get_platforms(path: str = get_dockerfiles_path()) -> List[str]:
     """Get a list of architectures given our dockerfiles"""
-    dockerfiles = glob.glob(os.path.join(path, "Dockerfile.build.*"))
+    dockerfiles = glob.glob(os.path.join(path, "Dockerfile.*"))
     dockerfiles = list(filter(lambda x: x[-1] != '~', dockerfiles))
-    files = list(map(lambda x: re.sub(r"Dockerfile.build.(.*)", r"\1", x), dockerfiles))
+    files = list(map(lambda x: re.sub(r"Dockerfile.(.*)", r"\1", x), dockerfiles))
     platforms = list(map(lambda x: os.path.split(x)[1], sorted(files)))
     return platforms
 
 
 def get_docker_tag(platform: str, registry: str) -> str:
-    """:return: docker tag to be used for the container"""
-    return "{0}/build.{1}".format(registry, platform)
+    return "{0}/{1}".format(registry, platform)
 
 
-def get_dockerfile(platform: str, path=get_dockerfiles_path()) -> str:
-    return os.path.join(path, "Dockerfile.build.{0}".format(platform))
+def get_dockerfile(platform: str, path="docker") -> str:
+    return os.path.join(path, "Dockerfile.{0}".format(platform))
 
 
 def get_docker_binary(use_nvidia_docker: bool) -> str:
diff --git a/ci/docker/Dockerfile.build.android_armv7 b/ci/docker/Dockerfile.android_armv7
similarity index 100%
rename from ci/docker/Dockerfile.build.android_armv7
rename to ci/docker/Dockerfile.android_armv7
diff --git a/ci/docker/Dockerfile.build.android_armv8 b/ci/docker/Dockerfile.android_armv8
similarity index 100%
rename from ci/docker/Dockerfile.build.android_armv8
rename to ci/docker/Dockerfile.android_armv8
diff --git a/ci/docker/Dockerfile.build.armv6 b/ci/docker/Dockerfile.armv6
similarity index 100%
rename from ci/docker/Dockerfile.build.armv6
rename to ci/docker/Dockerfile.armv6
diff --git a/ci/docker/Dockerfile.build.armv7 b/ci/docker/Dockerfile.armv7
similarity index 100%
rename from ci/docker/Dockerfile.build.armv7
rename to ci/docker/Dockerfile.armv7
diff --git a/ci/docker/Dockerfile.build.armv8 b/ci/docker/Dockerfile.armv8
similarity index 100%
rename from ci/docker/Dockerfile.build.armv8
rename to ci/docker/Dockerfile.armv8
diff --git a/ci/docker/Dockerfile.build.centos7_cpu b/ci/docker/Dockerfile.centos7_cpu
similarity index 100%
rename from ci/docker/Dockerfile.build.centos7_cpu
rename to ci/docker/Dockerfile.centos7_cpu
diff --git a/ci/docker/Dockerfile.build.centos7_gpu b/ci/docker/Dockerfile.centos7_gpu
similarity index 100%
rename from ci/docker/Dockerfile.build.centos7_gpu
rename to ci/docker/Dockerfile.centos7_gpu
diff --git a/ci/docker/Dockerfile.build.jetson b/ci/docker/Dockerfile.jetson
similarity index 100%
rename from ci/docker/Dockerfile.build.jetson
rename to ci/docker/Dockerfile.jetson
diff --git a/ci/docker/Dockerfile.build.ubuntu_base_cpu b/ci/docker/Dockerfile.ubuntu_base_cpu
similarity index 100%
rename from ci/docker/Dockerfile.build.ubuntu_base_cpu
rename to ci/docker/Dockerfile.ubuntu_base_cpu
diff --git a/ci/docker/Dockerfile.build.ubuntu_base_gpu b/ci/docker/Dockerfile.ubuntu_base_gpu
similarity index 100%
rename from ci/docker/Dockerfile.build.ubuntu_base_gpu
rename to ci/docker/Dockerfile.ubuntu_base_gpu
diff --git a/ci/docker/Dockerfile.build.ubuntu_blc b/ci/docker/Dockerfile.ubuntu_blc
similarity index 100%
rename from ci/docker/Dockerfile.build.ubuntu_blc
rename to ci/docker/Dockerfile.ubuntu_blc
diff --git a/ci/docker/Dockerfile.build.ubuntu_build_cuda b/ci/docker/Dockerfile.ubuntu_build_cuda
similarity index 100%
rename from ci/docker/Dockerfile.build.ubuntu_build_cuda
rename to ci/docker/Dockerfile.ubuntu_build_cuda
diff --git a/ci/docker/Dockerfile.build.ubuntu_cpu b/ci/docker/Dockerfile.ubuntu_cpu
similarity index 100%
rename from ci/docker/Dockerfile.build.ubuntu_cpu
rename to ci/docker/Dockerfile.ubuntu_cpu
diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu b/ci/docker/Dockerfile.ubuntu_gpu
similarity index 100%
rename from ci/docker/Dockerfile.build.ubuntu_gpu
rename to ci/docker/Dockerfile.ubuntu_gpu
diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt b/ci/docker/Dockerfile.ubuntu_gpu_tensorrt
similarity index 100%
rename from ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt
rename to ci/docker/Dockerfile.ubuntu_gpu_tensorrt
diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_cpu b/ci/docker/Dockerfile.ubuntu_nightly_cpu
similarity index 100%
rename from ci/docker/Dockerfile.build.ubuntu_nightly_cpu
rename to ci/docker/Dockerfile.ubuntu_nightly_cpu
diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu b/ci/docker/Dockerfile.ubuntu_nightly_gpu
similarity index 100%
rename from ci/docker/Dockerfile.build.ubuntu_nightly_gpu
rename to ci/docker/Dockerfile.ubuntu_nightly_gpu
diff --git a/ci/docker/Dockerfile.build.ubuntu_rat b/ci/docker/Dockerfile.ubuntu_rat
similarity index 100%
rename from ci/docker/Dockerfile.build.ubuntu_rat
rename to ci/docker/Dockerfile.ubuntu_rat
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 96b1646eff9..7ca9c780333 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -96,7 +96,7 @@ build_wheel() {
     popd
 }
 
-# Build commands: Every platform in docker/Dockerfile.build.<platform> should have a corresponding
+# Build commands: Every platform in docker/Dockerfile.<platform> should have a corresponding
 # function here with the same suffix:
 
 build_jetson() {
diff --git a/ci/test_docker_cache.py b/ci/test_docker_cache.py
index 358d54985ac..0a3bc4640c0 100644
--- a/ci/test_docker_cache.py
+++ b/ci/test_docker_cache.py
@@ -135,7 +135,7 @@ def test_full_cache(self):
                 """
         platform = 'test_full_cache'
         docker_tag = build_util.get_docker_tag(platform=platform, registry=DOCKER_REGISTRY_PATH)
-        dockerfile_path = os.path.join(DOCKERFILE_DIR, 'Dockerfile.build.' + platform)
+        dockerfile_path = os.path.join(DOCKERFILE_DIR, 'Dockerfile.' + platform)
         try:
             with open(dockerfile_path, 'w') as dockerfile_handle:
                 dockerfile_handle.write(dockerfile_content)
@@ -196,7 +196,7 @@ def test_partial_cache(self):
                 """
         platform = 'test_partial_cache'
         docker_tag = build_util.get_docker_tag(platform=platform, registry=DOCKER_REGISTRY_PATH)
-        dockerfile_path = os.path.join(DOCKERFILE_DIR, 'Dockerfile.build.' + platform)
+        dockerfile_path = os.path.join(DOCKERFILE_DIR, 'Dockerfile.' + platform)
         try:
             # Write initial Dockerfile
             with open(dockerfile_path, 'w') as dockerfile_handle:


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services