Skip to content

Commit b507c80

Browse files
patricklee2patricklee2
authored
Merge pull request #63 from Azure-App-Service/blimp20190712164851
sync from templates
2 parents cd659e7 + 016cac6 commit b507c80

File tree

4 files changed

+52
-12
lines changed

4 files changed

+52
-12
lines changed

‎5.6-apache/Dockerfile‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/oryx/php:5.6-20190607.1
1+
FROM mcr.microsoft.com/oryx/php:5.6-20190708.2
22
LABEL maintainer="Azure App Services Container Images <[email protected]>"
33

44
ENV PHP_VERSION 5.6
@@ -34,13 +34,23 @@ ENV PATH ${PATH}:/home/site/wwwroot
3434
RUN sed -i 's!ErrorLog ${APACHE_LOG_DIR}/error.log!ErrorLog /dev/stderr!g' /etc/apache2/apache2.conf
3535
RUN sed -i 's!User ${APACHE_RUN_USER}!User www-data!g' /etc/apache2/apache2.conf
3636
RUN sed -i 's!User ${APACHE_RUN_GROUP}!Group www-data!g' /etc/apache2/apache2.conf
37-
3837
RUN { \
3938
echo 'DocumentRoot /home/site/wwwroot'; \
4039
echo 'DirectoryIndex default.htm default.html index.htm index.html index.php hostingstart.html'; \
4140
echo 'ServerName localhost'; \
42-
echo 'CustomLog /dev/stdout combined'; \
41+
echo 'CustomLog /dev/stderr combined'; \
4342
} >> /etc/apache2/apache2.conf
43+
RUN rm -f /usr/local/etc/php/conf.d/php.ini \
44+
&& { \
45+
echo 'error_log=/dev/stderr'; \
46+
echo 'display_errors=Off'; \
47+
echo 'log_errors=On'; \
48+
echo 'display_startup_errors=Off'; \
49+
echo 'date.timezone=UTC'; \
50+
echo 'zend_extension=opcache'; \
51+
} > /usr/local/etc/php/conf.d/php.ini
52+
53+
RUN rm -f /etc/apache2/conf-enabled/other-vhosts-access-log.conf
4454

4555
WORKDIR /home/site/wwwroot
4656

‎7.0-apache/Dockerfile‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/oryx/php:7.0-20190607.1
1+
FROM mcr.microsoft.com/oryx/php:7.0-20190708.2
22
LABEL maintainer="Azure App Services Container Images <[email protected]>"
33

44
ENV PHP_VERSION 7.0
@@ -34,13 +34,23 @@ ENV PATH ${PATH}:/home/site/wwwroot
3434
RUN sed -i 's!ErrorLog ${APACHE_LOG_DIR}/error.log!ErrorLog /dev/stderr!g' /etc/apache2/apache2.conf
3535
RUN sed -i 's!User ${APACHE_RUN_USER}!User www-data!g' /etc/apache2/apache2.conf
3636
RUN sed -i 's!User ${APACHE_RUN_GROUP}!Group www-data!g' /etc/apache2/apache2.conf
37-
3837
RUN { \
3938
echo 'DocumentRoot /home/site/wwwroot'; \
4039
echo 'DirectoryIndex default.htm default.html index.htm index.html index.php hostingstart.html'; \
4140
echo 'ServerName localhost'; \
42-
echo 'CustomLog /dev/stdout combined'; \
41+
echo 'CustomLog /dev/stderr combined'; \
4342
} >> /etc/apache2/apache2.conf
43+
RUN rm -f /usr/local/etc/php/conf.d/php.ini \
44+
&& { \
45+
echo 'error_log=/dev/stderr'; \
46+
echo 'display_errors=Off'; \
47+
echo 'log_errors=On'; \
48+
echo 'display_startup_errors=Off'; \
49+
echo 'date.timezone=UTC'; \
50+
echo 'zend_extension=opcache'; \
51+
} > /usr/local/etc/php/conf.d/php.ini
52+
53+
RUN rm -f /etc/apache2/conf-enabled/other-vhosts-access-log.conf
4454

4555
WORKDIR /home/site/wwwroot
4656

‎7.2-apache/Dockerfile‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/oryx/php:7.2-20190607.1
1+
FROM mcr.microsoft.com/oryx/php:7.2-20190708.2
22
LABEL maintainer="Azure App Services Container Images <[email protected]>"
33

44
ENV PHP_VERSION 7.2
@@ -34,13 +34,23 @@ ENV PATH ${PATH}:/home/site/wwwroot
3434
RUN sed -i 's!ErrorLog ${APACHE_LOG_DIR}/error.log!ErrorLog /dev/stderr!g' /etc/apache2/apache2.conf
3535
RUN sed -i 's!User ${APACHE_RUN_USER}!User www-data!g' /etc/apache2/apache2.conf
3636
RUN sed -i 's!User ${APACHE_RUN_GROUP}!Group www-data!g' /etc/apache2/apache2.conf
37-
3837
RUN { \
3938
echo 'DocumentRoot /home/site/wwwroot'; \
4039
echo 'DirectoryIndex default.htm default.html index.htm index.html index.php hostingstart.html'; \
4140
echo 'ServerName localhost'; \
42-
echo 'CustomLog /dev/stdout combined'; \
41+
echo 'CustomLog /dev/stderr combined'; \
4342
} >> /etc/apache2/apache2.conf
43+
RUN rm -f /usr/local/etc/php/conf.d/php.ini \
44+
&& { \
45+
echo 'error_log=/dev/stderr'; \
46+
echo 'display_errors=Off'; \
47+
echo 'log_errors=On'; \
48+
echo 'display_startup_errors=Off'; \
49+
echo 'date.timezone=UTC'; \
50+
echo 'zend_extension=opcache'; \
51+
} > /usr/local/etc/php/conf.d/php.ini
52+
53+
RUN rm -f /etc/apache2/conf-enabled/other-vhosts-access-log.conf
4454

4555
WORKDIR /home/site/wwwroot
4656

‎7.3-apache/Dockerfile‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/oryx/php:7.3-20190607.1
1+
FROM mcr.microsoft.com/oryx/php:7.3-20190708.2
22
LABEL maintainer="Azure App Services Container Images <[email protected]>"
33

44
ENV PHP_VERSION 7.3
@@ -34,13 +34,23 @@ ENV PATH ${PATH}:/home/site/wwwroot
3434
RUN sed -i 's!ErrorLog ${APACHE_LOG_DIR}/error.log!ErrorLog /dev/stderr!g' /etc/apache2/apache2.conf
3535
RUN sed -i 's!User ${APACHE_RUN_USER}!User www-data!g' /etc/apache2/apache2.conf
3636
RUN sed -i 's!User ${APACHE_RUN_GROUP}!Group www-data!g' /etc/apache2/apache2.conf
37-
3837
RUN { \
3938
echo 'DocumentRoot /home/site/wwwroot'; \
4039
echo 'DirectoryIndex default.htm default.html index.htm index.html index.php hostingstart.html'; \
4140
echo 'ServerName localhost'; \
42-
echo 'CustomLog /dev/stdout combined'; \
41+
echo 'CustomLog /dev/stderr combined'; \
4342
} >> /etc/apache2/apache2.conf
43+
RUN rm -f /usr/local/etc/php/conf.d/php.ini \
44+
&& { \
45+
echo 'error_log=/dev/stderr'; \
46+
echo 'display_errors=Off'; \
47+
echo 'log_errors=On'; \
48+
echo 'display_startup_errors=Off'; \
49+
echo 'date.timezone=UTC'; \
50+
echo 'zend_extension=opcache'; \
51+
} > /usr/local/etc/php/conf.d/php.ini
52+
53+
RUN rm -f /etc/apache2/conf-enabled/other-vhosts-access-log.conf
4454

4555
WORKDIR /home/site/wwwroot
4656

0 commit comments

Comments
 (0)