Merge pull request #2 from infosiftr/php-a

Add CMD php -a; replace awk with magic bash

Author: daghack

5.3/Dockerfile

@@ -26,3 +26,5 @@ RUN set -x \
 	&& dpkg -r bison libbison-dev \
 	&& apt-get purge -y --auto-remove autoconf2.13 curl \
 	&& rm -r /usr/src/php
+
+CMD ["php", "-a"]

5.4/Dockerfile

@@ -25,3 +25,5 @@ RUN set -x \
 	&& dpkg -r bison libbison-dev \
 	&& apt-get purge -y --auto-remove curl \
 	&& rm -r /usr/src/php
+
+CMD ["php", "-a"]

5.5/Dockerfile

@@ -25,3 +25,5 @@ RUN set -x \
 	&& dpkg -r bison libbison-dev \
 	&& apt-get purge -y --auto-remove curl \
 	&& rm -r /usr/src/php
+
+CMD ["php", "-a"]

5.6/Dockerfile

@@ -25,3 +25,5 @@ RUN set -x \
 	&& dpkg -r bison libbison-dev \
 	&& apt-get purge -y --auto-remove curl \
 	&& rm -r /usr/src/php
+
+CMD ["php", "-a"]

Dockerfile-apache-tail

@@ -1,4 +1,3 @@
-
 ENV PATH $PATH:/usr/local/apache2/bin
 
 WORKDIR /var/www/html

update.sh

@@ -31,15 +31,18 @@ for version in "${versions[@]}"; do
 		exit 1
 	fi
 
-	insert="$(cat "Dockerfile-apache-insert" | sed 's/[\]/\\&/g')"
+	dockerfile="$( cat "$version/Dockerfile")"
+	apacheInsert="$(cat "Dockerfile-apache-insert")"
+	apacheTail="$(cat "Dockerfile-apache-tail")"
 	(
 		set -x
 		sed -ri '
 			s/^(ENV PHP_VERSION) .*/\1 '"$fullVersion"'/;
 			s/^(RUN gpg .* --recv-keys) [0-9a-fA-F ]*$/\1 '"$gpgKey"'/
 		' "$version/Dockerfile"
 
-		awk -vf2="$insert" '/^\t&& make install \\$/{print f2;next}1' "$version/Dockerfile" "Dockerfile-apache-tail" > "$version/apache/Dockerfile"
+		apacheDockerfile="${dockerfile/?\&\& make install \\/$apacheInsert}"
+		echo "${apacheDockerfile/CMD*/$apacheTail}" > "$version/apache/Dockerfile"
 	)
 done