Merge 3b81357a87
into 0598f0762a
This commit is contained in:
commit
a61db2ff44
|
@ -12,7 +12,7 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
FROM php:5-apache
|
FROM docker.io/library/php:5-apache
|
||||||
|
|
||||||
RUN pear channel-discover pear.nrk.io
|
RUN pear channel-discover pear.nrk.io
|
||||||
RUN pear install nrk/Predis
|
RUN pear install nrk/Predis
|
||||||
|
@ -21,9 +21,10 @@ RUN pear install nrk/Predis
|
||||||
# /proc/self/fd/{1,2} are Unix sockets and apache will not be able to open()
|
# /proc/self/fd/{1,2} are Unix sockets and apache will not be able to open()
|
||||||
# them. Use "cat" to write directly to the already opened fds without opening
|
# them. Use "cat" to write directly to the already opened fds without opening
|
||||||
# them again.
|
# them again.
|
||||||
RUN sed -i 's#ErrorLog /proc/self/fd/2#ErrorLog "|$/bin/cat 1>\&2"#' /etc/apache2/apache2.conf
|
RUN sed -i \
|
||||||
RUN sed -i 's#CustomLog /proc/self/fd/1 combined#CustomLog "|/bin/cat" combined#' /etc/apache2/apache2.conf
|
-e 's#ErrorLog /proc/self/fd/2#ErrorLog "|/bin/cat 1>&2"#' \
|
||||||
|
-e 's#CustomLog /proc/self/fd/1 combined#CustomLog "|/bin/cat" combined#' \
|
||||||
|
/etc/apache2/apache2.conf
|
||||||
|
|
||||||
ADD guestbook.php /var/www/html/guestbook.php
|
# Copy application files
|
||||||
ADD controllers.js /var/www/html/controllers.js
|
COPY guestbook.php controllers.js index.html /var/www/html/
|
||||||
ADD index.html /var/www/html/index.html
|
|
||||||
|
|
Loading…
Reference in New Issue