Updating FROM of Dockerfile's

azukiapp · May 23, 2015 · e73ebdf · e73ebdf
1 parent 6c233e5
commit e73ebdf
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 138 deletions.
diff --git a/5.5/Dockerfile b/5.5/Dockerfile
@@ -1,58 +1,52 @@
-# The container includes:
+# The image includes:
 #
+# PARENT:
 # - Git
-# - Apache2
-# - PHP Version 5.5.9
-# - Composer
+# - Vim
 # - Node
 # - MySQL Client
 # - PostgreSQL Client
 # - MongoDB
+# - Apache2 with root
 #
+# THIS:
+# - PHP Version 5.5
+# - Composer
 
-FROM azukiapp/node
+FROM azukiapp/apache2
 MAINTAINER Azuki <support@azukiapp.com>
 
 # Install PHP5 + Apache2 + Libs
-RUN apt-get update -qq \
-  && apt-get install -y -qq \
-        apache2 \
-        libxml2 \
-        libcurl4-openssl-dev \
-        libapache2-mod-php5 \
-        php5-dev \
-        php5-cli \
-        php5-mysql \
-        php5-pgsql \
-        php5-mcrypt \
-        php5-curl \
-        php5-json \
-        php5-gd \
-        php-pear \
-        php-apc \
+# Enable php and apache modules
+RUN  phpDeps='libxml2 \
+              libcurl4-openssl-dev \
+              libapache2-mod-php5 \
+              php5-dev \
+              php5-cli \
+              php5-mysql \
+              php5-pgsql \
+              php5-mcrypt \
+              php5-curl \
+              php5-json \
+              php5-gd \
+              php-pear \
+              php-apc' \
+  && apt-get update -qq \
+  && apt-get install -y -qq $phpDeps \
   && pecl install mongo \
   && apt-get clean -qq \
-  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# Enable php and apache modules
-RUN echo "extension=mongo.so" > /etc/php5/mods-available/mongo.ini
-RUN a2enmod rewrite && \
-    php5enmod mcrypt mongo
-
-RUN sed -i "s/variables_order.*/variables_order = \"EGPCS\"/g" /etc/php5/apache2/php.ini
-RUN sed -i 's/\/var\/www\/html/\/var\/www\/public/g' /etc/apache2/sites-available/000-default.conf
-
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-# Add image configuration and scripts
-ADD run.sh /run.sh
-RUN chmod 755 /*.sh
+  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
+  && apt-get purge -y --auto-remove $buildDeps \
+  && echo "extension=mongo.so" > /etc/php5/mods-available/mongo.ini \
+  && a2enmod rewrite \
+  && php5enmod mcrypt mongo \
+  && sed -i -e "s/variables_order.*/variables_order = \"EGPCS\"/g" /etc/php5/apache2/php.ini \
+  && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
 
-# Configure /app folder with sample app
-RUN mkdir -p /app && rm -fr /var/www && ln -s /app /var/www
-ADD sample/ /app
+# Configure nginx root with sample app
+ADD sample/ /var/www/public
 
 EXPOSE 80
 WORKDIR /app
 
-CMD ["/run.sh"]
+CMD ["apache2-foreground"]
diff --git a/5.5/run.sh b/5.5/run.sh
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -1,63 +1,57 @@
-# The container includes:
+# The image includes:
 #
+# PARENT:
 # - Git
-# - Apache2
-# - PHP Version 5.6
-# - Composer
+# - Vim
 # - Node
 # - MySQL Client
 # - PostgreSQL Client
 # - MongoDB
+# - Apache2 with root
+#
+# THIS:
+# - PHP Version 5.6
+# - Composer
 
-FROM azukiapp/node
+FROM azukiapp/apache2
 MAINTAINER Azuki <support@azukiapp.com>
 
 # Add PHP repository to apt source
-RUN echo "deb http://ppa.launchpad.net/ondrej/php5-5.6/ubuntu trusty main" \
-        > /etc/apt/sources.list.d/php5-5.6.list && \
-    apt-key adv --keyserver keyserver.ubuntu.com --recv-key E5267A6C
+RUN  echo "deb http://ppa.launchpad.net/ondrej/php5-5.6/ubuntu trusty main" \
+      > /etc/apt/sources.list.d/php5-5.6.list \
+  && apt-key adv --keyserver keyserver.ubuntu.com --recv-key E5267A6C
 
 # Install PHP5 + Apache2 + Libs
-RUN apt-get update -qq \
-  && apt-get install -y -qq \
-        apache2 \
-        libxml2 \
-        libcurl4-openssl-dev \
-        libapache2-mod-php5 \
-        php5-dev \
-        php5-cli \
-        php5-mysql \
-        php5-pgsql \
-        php5-mcrypt \
-        php5-curl \
-        php5-json \
-        php5-gd \
-        php-pear \
-        php-apc \
+# Enable php and apache modules
+RUN  phpDeps='libxml2 \
+              libcurl4-openssl-dev \
+              libapache2-mod-php5 \
+              php5-dev \
+              php5-cli \
+              php5-mysql \
+              php5-pgsql \
+              php5-mcrypt \
+              php5-curl \
+              php5-json \
+              php5-gd \
+              php-pear \
+              php-apc' \
+  && apt-get update -qq \
+  && apt-get install -y -qq $phpDeps \
   && pecl install mongo \
   && apt-get clean -qq \
-  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-
-# Enable php and apache modules
-RUN echo "extension=mongo.so" > /etc/php5/mods-available/mongo.ini
-RUN a2enmod rewrite && \
-    php5enmod mcrypt mongo
-
-RUN  sed -i -e "s/variables_order.*/variables_order = \"EGPCS\"/g" /etc/php5/apache2/php.ini \
-  && sed -i -e "s/\/var\/www\/html/\/var\/www\/public/g" /etc/apache2/sites-available/000-default.conf
-
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-# Add image configuration and scripts
-ADD run.sh /run.sh
-RUN chmod 755 /*.sh
+  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
+  && apt-get purge -y --auto-remove $buildDeps \
+  && echo "extension=mongo.so" > /etc/php5/mods-available/mongo.ini \
+  && a2enmod rewrite \
+  && php5enmod mcrypt mongo \
+  && sed -i -e "s/variables_order.*/variables_order = \"EGPCS\"/g" /etc/php5/apache2/php.ini \
+  && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
 
 # Configure nginx root with sample app
 ADD sample/ /var/www/public
-RUN chown -R :www-data /var/www/public
 
 EXPOSE 80
 WORKDIR /app
 
-CMD ["/run.sh"]
+CMD ["apache2-foreground"]
diff --git a/5.6/run.sh b/5.6/run.sh
diff --git a/README.md b/README.md
@@ -14,20 +14,19 @@ Versions (tags)
 Image content:
 ---
 
+##### PARENT:
 - Ubuntu 14.04
 - Git
-- VIM
-- Composer
-- NodeJS
-- npm
-- PHP
-
-Database:
-
-- PostgreSQL client
-- MySQL client
+- Vim
+- Node
+- MySQL Client
+- PostgreSQL Client
 - MongoDB
-- SQLite3
+- Apache2 with root
+
+###### THIS:
+- PHP Version 5.6/5.5
+- Composer
 
 ### Usage with `azk`
 
@@ -68,13 +67,6 @@ systems({
     envs: {
       // set instances variables
       APP_DIR: "/azk/#{manifest.dir}",
-      PHP_ENV: "dev",
-    },
-    docker_extra: {
-      // extra docker options
-      start: {
-        Privileged: "true",
-      },
     },
   },
 });