From 581dfdabe6685eb3c005e3bf605cd6564f8373be Mon Sep 17 00:00:00 2001 From: Tobias Reich Date: Sat, 13 Dec 2014 14:41:55 +0100 Subject: [PATCH] Docker improvements #252 --- Dockerfile | 9 +++------ src/commands/start | 5 +++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 29ab650..3b89398 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,9 @@ FROM ubuntu:14.04 -# Install base packages +# Install packages RUN apt-get update -RUN apt-get -y install git curl nano wget build-essential - -# 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 +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 # Modify php.ini to contain the following settings: # max_execution_time = 200 diff --git a/src/commands/start b/src/commands/start index 2561c68..60f0254 100755 --- a/src/commands/start +++ b/src/commands/start @@ -1,8 +1,9 @@ #!/bin/bash # Run this script to start Apache and MySQL -# + # Start MySQL mysqld & + # Start Apache source /etc/apache2/envvars -exec apache2 -D FOREGROUND +exec apache2 -D FOREGROUND \ No newline at end of file