Browse Source

Docker improvements #252

Tobias Reich 9 years ago
parent
commit
581dfdabe6
2 changed files with 6 additions and 8 deletions
  1. 3 6
      Dockerfile
  2. 3 2
      src/commands/start

+ 3 - 6
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

+ 3 - 2
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