all-builder: switch to templates for -builder dirs

This commit removes the Dockerfiles from the -builder directories and relies on build_containers.sh populating the Dockerfiles from the dockerfiles/templates/Dockerfile.builder. All the files are the same except for which -base distro they pull from. A README is also added to the -builder directories to discourage people from putting Dockerfiles there as the current logic will just overwrite them. Signed-off-by: brian avery <[email protected]>
jwakre · Jul 7, 2017 · fa5f3f9 · fa5f3f9
1 parent 8bde54b
commit fa5f3f9
Show file tree

Hide file tree

Showing 26 changed files with 26 additions and 351 deletions.
diff --git a/dockerfiles/centos/centos-7/centos-7-builder/Dockerfile b/dockerfiles/centos/centos-7/centos-7-builder/Dockerfile
diff --git a/dockerfiles/centos/centos-7/centos-7-builder/README b/dockerfiles/centos/centos-7/centos-7-builder/README
@@ -0,0 +1,2 @@
+The Dockerfile for this directory is autogenerated based on dockerfiles/templates/Dockerfile.builder
+Do not place an actual Dockerfile here.
diff --git a/dockerfiles/debian/debian-8/debian-8-builder/Dockerfile b/dockerfiles/debian/debian-8/debian-8-builder/Dockerfile
diff --git a/dockerfiles/debian/debian-8/debian-8-builder/README b/dockerfiles/debian/debian-8/debian-8-builder/README
@@ -0,0 +1,2 @@
+The Dockerfile for this directory is autogenerated based on dockerfiles/templates/Dockerfile.builder
+Do not place an actual Dockerfile here.
diff --git a/dockerfiles/fedora/fedora-22/fedora-22-builder/Dockerfile b/dockerfiles/fedora/fedora-22/fedora-22-builder/Dockerfile
diff --git a/dockerfiles/fedora/fedora-22/fedora-22-builder/README b/dockerfiles/fedora/fedora-22/fedora-22-builder/README
@@ -0,0 +1,2 @@
+The Dockerfile for this directory is autogenerated based on dockerfiles/templates/Dockerfile.builder
+Do not place an actual Dockerfile here.
diff --git a/dockerfiles/fedora/fedora-23/fedora-23-builder/Dockerfile b/dockerfiles/fedora/fedora-23/fedora-23-builder/Dockerfile
diff --git a/dockerfiles/fedora/fedora-23/fedora-23-builder/README b/dockerfiles/fedora/fedora-23/fedora-23-builder/README
@@ -0,0 +1,2 @@
+The Dockerfile for this directory is autogenerated based on dockerfiles/templates/Dockerfile.builder
+Do not place an actual Dockerfile here.
diff --git a/dockerfiles/fedora/fedora-24/fedora-24-builder/Dockerfile b/dockerfiles/fedora/fedora-24/fedora-24-builder/Dockerfile
diff --git a/dockerfiles/fedora/fedora-24/fedora-24-builder/README b/dockerfiles/fedora/fedora-24/fedora-24-builder/README
@@ -0,0 +1,2 @@
+The Dockerfile for this directory is autogenerated based on dockerfiles/templates/Dockerfile.builder
+Do not place an actual Dockerfile here.
diff --git a/dockerfiles/fedora/fedora-25/fedora-25-builder/Dockerfile b/dockerfiles/fedora/fedora-25/fedora-25-builder/Dockerfile
diff --git a/dockerfiles/fedora/fedora-25/fedora-25-builder/README b/dockerfiles/fedora/fedora-25/fedora-25-builder/README
@@ -0,0 +1,2 @@
+The Dockerfile for this directory is autogenerated based on dockerfiles/templates/Dockerfile.builder
+Do not place an actual Dockerfile here.
diff --git a/dockerfiles/opensuse/opensuse-13.2/opensuse-13.2-builder/Dockerfile b/dockerfiles/opensuse/opensuse-13.2/opensuse-13.2-builder/Dockerfile
diff --git a/dockerfiles/opensuse/opensuse-13.2/opensuse-13.2-builder/README b/dockerfiles/opensuse/opensuse-13.2/opensuse-13.2-builder/README
@@ -0,0 +1,2 @@
+The Dockerfile for this directory is autogenerated based on dockerfiles/templates/Dockerfile.builder
+Do not place an actual Dockerfile here.
diff --git a/dockerfiles/opensuse/opensuse-42.1/opensuse-42.1-builder/Dockerfile b/dockerfiles/opensuse/opensuse-42.1/opensuse-42.1-builder/Dockerfile
diff --git a/dockerfiles/opensuse/opensuse-42.1/opensuse-42.1-builder/README b/dockerfiles/opensuse/opensuse-42.1/opensuse-42.1-builder/README
@@ -0,0 +1,2 @@
+The Dockerfile for this directory is autogenerated based on dockerfiles/templates/Dockerfile.builder
+Do not place an actual Dockerfile here.
diff --git a/dockerfiles/opensuse/opensuse-42.2/opensuse-42.2-builder/Dockerfile b/dockerfiles/opensuse/opensuse-42.2/opensuse-42.2-builder/Dockerfile
diff --git a/dockerfiles/opensuse/opensuse-42.2/opensuse-42.2-builder/README b/dockerfiles/opensuse/opensuse-42.2/opensuse-42.2-builder/README
@@ -0,0 +1,2 @@
+The Dockerfile for this directory is autogenerated based on dockerfiles/templates/Dockerfile.builder
+Do not place an actual Dockerfile here.
diff --git a/dockerfiles/ubuntu/ubuntu-14.04/ubuntu-14.04-builder/Dockerfile b/dockerfiles/ubuntu/ubuntu-14.04/ubuntu-14.04-builder/Dockerfile
diff --git a/dockerfiles/ubuntu/ubuntu-14.04/ubuntu-14.04-builder/README b/dockerfiles/ubuntu/ubuntu-14.04/ubuntu-14.04-builder/README
@@ -0,0 +1,2 @@
+The Dockerfile for this directory is autogenerated based on dockerfiles/templates/Dockerfile.builder
+Do not place an actual Dockerfile here.
diff --git a/dockerfiles/ubuntu/ubuntu-16.04/ubuntu-16.04-builder/Dockerfile b/dockerfiles/ubuntu/ubuntu-16.04/ubuntu-16.04-builder/Dockerfile
diff --git a/dockerfiles/ubuntu/ubuntu-16.04/ubuntu-16.04-builder/README b/dockerfiles/ubuntu/ubuntu-16.04/ubuntu-16.04-builder/README
@@ -0,0 +1,2 @@
+The Dockerfile for this directory is autogenerated based on dockerfiles/templates/Dockerfile.builder
+Do not place an actual Dockerfile here.
diff --git a/dockerfiles/ubuntu/ubuntu-16.10/ubuntu-16.10-builder/Dockerfile b/dockerfiles/ubuntu/ubuntu-16.10/ubuntu-16.10-builder/Dockerfile
diff --git a/dockerfiles/ubuntu/ubuntu-16.10/ubuntu-16.10-builder/README b/dockerfiles/ubuntu/ubuntu-16.10/ubuntu-16.10-builder/README
@@ -0,0 +1,2 @@
+The Dockerfile for this directory is autogenerated based on dockerfiles/templates/Dockerfile.builder
+Do not place an actual Dockerfile here.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		The Dockerfile for this directory is autogenerated based on dockerfiles/templates/Dockerfile.builder
		Do not place an actual Dockerfile here.