Merge pull request #19 from bavery22/templatizeAndFixBuilders

Templatize and fix builders
crops · Jul 18, 2017 · 2a7d665 · 2a7d665
2 parents 105156e + acbe89b
commit 2a7d665
Show file tree

Hide file tree

Showing 28 changed files with 36 additions and 330 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+dockerfiles/*/*/*-builder/Dockerfile
 *.pyc
 *.pyo
 *.orig

diff --git a/build_container.sh b/build_container.sh
@@ -51,6 +51,9 @@ cd -
 # can modify the Dockerfile to use whatever REPO is in the environment.
 TAG=$DISTRO_TO_BUILD-builder
 dockerdir=`find -name $TAG`
+# use the builder template to populate the distro specific Dockerfile
+cp dockerfiles/templates/Dockerfile.builder $dockerdir/Dockerfile
+sed -i "s/DISTRO_TO_BUILD/$DISTRO_TO_BUILD/g" $dockerdir/Dockerfile
 workdir=`mktemp --tmpdir -d tmp-$TAG.XXX`
 
 cp -r $dockerdir $workdir

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/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/...ra/fedora-25/fedora-25-builder/Dockerfile → dockerfiles/templates/Dockerfile.builder b/...ra/fedora-25/fedora-25-builder/Dockerfile → dockerfiles/templates/Dockerfile.builder
@@ -1,4 +1,4 @@
-# fedora-25-builder
+# DISTRO_TO_BUILD-builder
 # Copyright (C) 2015-2017 Intel Corporation
 #
 # This program is free software; you can redistribute it and/or modify
@@ -14,14 +14,14 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-FROM crops/yocto:fedora-25-base
+FROM crops/yocto:DISTRO_TO_BUILD-base
 
 USER root
-COPY runbitbake.py /home/yoctouser/
-RUN chown -R yoctouser /home/yoctouser/ && \
-    chmod +x /home/yoctouser/runbitbake.py
+COPY runbitbake.py /usr/local/bin
+RUN chown  yoctouser:yoctouser /usr/local/bin/runbitbake.py && \
+    chmod +x /usr/local/bin/runbitbake.py
 
 USER yoctouser
 
 WORKDIR /home/yoctouser
-ENTRYPOINT ["/home/yoctouser/runbitbake.py"]
+ENTRYPOINT ["/usr/local/bin/runbitbake.py"]
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 change
@@ -1,3 +1,4 @@
+    dockerfiles/*/*/*-builder/Dockerfile
     *.pyc
     *.pyo
     *.orig
@@ Expand Down @@
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.