Merge pull request #298 from dachary/wip-update-reminder

Dockerfile: redirect the contributor to update.sh

10 files changed, 15 insertions, 1 deletions

diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile
index 4fa051fe..7c2e09c5 100644
--- a/11.0/apache/Dockerfile
+++ b/11.0/apache/Dockerfile
@@ -1,3 +1,4 @@
+# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:7.1-apache
 
 # entrypoint.sh and cron.sh dependencies
diff --git a/11.0/fpm-alpine/Dockerfile b/11.0/fpm-alpine/Dockerfile
index 198eba7c..16c3720b 100644
--- a/11.0/fpm-alpine/Dockerfile
+++ b/11.0/fpm-alpine/Dockerfile
@@ -1,3 +1,4 @@
+# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
 FROM php:7.1-fpm-alpine
 
 # entrypoint.sh and cron.sh dependencies
diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile
index 512aca64..13584b66 100644
--- a/11.0/fpm/Dockerfile
+++ b/11.0/fpm/Dockerfile
@@ -1,3 +1,4 @@
+# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:7.1-fpm
 
 # entrypoint.sh and cron.sh dependencies
diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile
index 130d2c7d..6f0439d2 100644
--- a/12.0/apache/Dockerfile
+++ b/12.0/apache/Dockerfile
@@ -1,3 +1,4 @@
+# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:7.1-apache
 
 # entrypoint.sh and cron.sh dependencies
diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile
index 9a76cac2..928cf25a 100644
--- a/12.0/fpm-alpine/Dockerfile
+++ b/12.0/fpm-alpine/Dockerfile
@@ -1,3 +1,4 @@
+# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
 FROM php:7.1-fpm-alpine
 
 # entrypoint.sh and cron.sh dependencies
diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile
index 26dee8db..6483bed1 100644
--- a/12.0/fpm/Dockerfile
+++ b/12.0/fpm/Dockerfile
@@ -1,3 +1,4 @@
+# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:7.1-fpm
 
 # entrypoint.sh and cron.sh dependencies
diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile
index 8e2b203b..61a4c34c 100644
--- a/13.0/apache/Dockerfile
+++ b/13.0/apache/Dockerfile
@@ -1,3 +1,4 @@
+# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:7.1-apache
 
 # entrypoint.sh and cron.sh dependencies
diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile
index 828be93c..bd28f494 100644
--- a/13.0/fpm-alpine/Dockerfile
+++ b/13.0/fpm-alpine/Dockerfile
@@ -1,3 +1,4 @@
+# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
 FROM php:7.1-fpm-alpine
 
 # entrypoint.sh and cron.sh dependencies
diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile
index d0733803..ac61eed8 100644
--- a/13.0/fpm/Dockerfile
+++ b/13.0/fpm/Dockerfile
@@ -1,3 +1,4 @@
+# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:7.1-fpm
 
 # entrypoint.sh and cron.sh dependencies
diff --git a/update.sh b/update.sh
index 7b5dbdf0..aa3805a7 100755
--- a/update.sh
+++ b/update.sh
@@ -55,7 +55,10 @@ function create_variant() {
 	# Create the version+variant directory with a Dockerfile.
 	mkdir -p "$dir"
 
-	cp "Dockerfile-${base[$variant]}.template" "$dir/Dockerfile"
+        template="Dockerfile-${base[$variant]}.template"
+        rm -f "$dir/Dockerfile"
+        echo "# DO NOT EDIT: created by update.sh from $template" > "$dir/Dockerfile"
+	cat "$template" >> "$dir/Dockerfile"
 
 	echo "updating $fullversion [$1] $variant"
 
@@ -71,6 +74,8 @@ function create_variant() {
 		s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
 		s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
 	' "$dir/Dockerfile"
+        # remove write permission as a reminder this file must be modified with this script
+        chmod -w "$dir/Dockerfile"
 
 	# Copy the shell scripts
 	for name in entrypoint cron; do