Docker improvements #252

This commit is contained in:
Tobias Reich 2014-12-13 14:41:55 +01:00
parent daf9af1997
commit 581dfdabe6
2 changed files with 6 additions and 8 deletions

View File

@ -1,12 +1,9 @@
FROM ubuntu:14.04 FROM ubuntu:14.04
# Install base packages # Install packages
RUN apt-get update RUN apt-get update
RUN apt-get -y install git curl nano wget build-essential RUN apt-get -y install git
RUN apt-get -y install apache2 mysql-server libapache2-mod-php5 imagemagick php5-mysql php5-gd php5-curl php5-imagick
# Install Apache, PHP, MySQL, and ImageMagick
RUN apt-get -y install apache2 mysql-server libapache2-mod-php5 imagemagick
RUN apt-get -y install php5-mysql php5-gd php5-curl php5-imagick
# Modify php.ini to contain the following settings: # Modify php.ini to contain the following settings:
# max_execution_time = 200 # max_execution_time = 200

View File

@ -1,8 +1,9 @@
#!/bin/bash #!/bin/bash
# Run this script to start Apache and MySQL # Run this script to start Apache and MySQL
#
# Start MySQL # Start MySQL
mysqld & mysqld &
# Start Apache # Start Apache
source /etc/apache2/envvars source /etc/apache2/envvars
exec apache2 -D FOREGROUND exec apache2 -D FOREGROUND