Skip to content

Commit 3904b17

Browse files
committed
Add CMD php -a; replace awk with magic bash
1 parent d143b7e commit 3904b17

File tree

6 files changed

+13
-3
lines changed

6 files changed

+13
-3
lines changed

5.3/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,5 @@ RUN set -x \
2626
&& dpkg -r bison libbison-dev \
2727
&& apt-get purge -y --auto-remove autoconf2.13 curl \
2828
&& rm -r /usr/src/php
29+
30+
CMD ["php", "-a"]

5.4/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ RUN set -x \
2525
&& dpkg -r bison libbison-dev \
2626
&& apt-get purge -y --auto-remove curl \
2727
&& rm -r /usr/src/php
28+
29+
CMD ["php", "-a"]

5.5/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ RUN set -x \
2525
&& dpkg -r bison libbison-dev \
2626
&& apt-get purge -y --auto-remove curl \
2727
&& rm -r /usr/src/php
28+
29+
CMD ["php", "-a"]

5.6/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ RUN set -x \
2525
&& dpkg -r bison libbison-dev \
2626
&& apt-get purge -y --auto-remove curl \
2727
&& rm -r /usr/src/php
28+
29+
CMD ["php", "-a"]

Dockerfile-apache-tail

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
ENV PATH $PATH:/usr/local/apache2/bin
32

43
WORKDIR /var/www/html

update.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,18 @@ for version in "${versions[@]}"; do
3131
exit 1
3232
fi
3333

34-
insert="$(cat "Dockerfile-apache-insert" | sed 's/[\]/\\&/g')"
34+
dockerfile="$( cat "$version/Dockerfile")"
35+
apacheInsert="$(cat "Dockerfile-apache-insert")"
36+
apacheTail="$(cat "Dockerfile-apache-tail")"
3537
(
3638
set -x
3739
sed -ri '
3840
s/^(ENV PHP_VERSION) .*/\1 '"$fullVersion"'/;
3941
s/^(RUN gpg .* --recv-keys) [0-9a-fA-F ]*$/\1 '"$gpgKey"'/
4042
' "$version/Dockerfile"
4143

42-
awk -vf2="$insert" '/^\t&& make install \\$/{print f2;next}1' "$version/Dockerfile" "Dockerfile-apache-tail" > "$version/apache/Dockerfile"
44+
apacheDockerfile="${dockerfile/?\&\& make install \\/$apacheInsert}"
45+
echo "${apacheDockerfile/CMD*/$apacheTail}" > "$version/apache/Dockerfile"
4346
)
4447
done
4548

0 commit comments

Comments
 (0)