Using only docker for installation (no chroot anymore).

Author: dashohoxha

Dockerfile

@@ -1,21 +1,14 @@
 ### This file can be used to build a docker image like this:
 ###   `docker build --tag=btr_client .`
-### It can also be used for automated builds in Docker Hub
-### (see https://docs.docker.com/userguide/dockerrepos/#automated-builds)
 
-FROM ubuntu:14.04
+FROM ubuntu-upstart:14.04
 
-### Install packages first, in order to take advantage
-### of caching features of `docker build`.
-COPY install/scripts/packages-and-software.sh /tmp/
-RUN DEBIAN_FRONTEND=noninteractive /tmp/packages-and-software.sh
+### Install packages.
+COPY install/packages.sh /tmp/
+RUN DEBIAN_FRONTEND=noninteractive /tmp/packages.sh
 
-### Copy the source code and run the installer.
+### Copy the source code and install.
 COPY . /usr/local/src/btr_client/
 ENV code_dir /usr/local/src/btr_client
 WORKDIR /usr/local/src/btr_client/
-RUN ["install/install-container.sh", "install/settings.sh"]
-
-### Set the default command to run in the container.
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf", "--nodaemon"]
-
+RUN ["install/install.sh"]

dev/clone.sh

@@ -93,10 +93,8 @@ chown www-data: -R $dst_dir/sites/default/files/*
 chown root: $dst_dir/sites/default/files/.htaccess
 
 ### restart services
-for service in php5-fpm memcached mysql nginx apache2
-do
-    if test -f /etc/supervisor/conf.d/$service.conf
-    then
-        supervisorctl restart $service
-    fi
-done
+/etc/init.d/mysql restart
+/etc/init.d/apache2 restart
+#/etc/init.d/php5-fpm restart
+#/etc/init.d/memcached restart
+#/etc/init.d/nginx restart

dev/clone_rm.sh

@@ -37,11 +37,8 @@ sed -i /etc/hosts -e "/^127.0.0.1 $hostname/d"
 sed -i /etc/hosts.conf -e "/^127.0.0.1 $hostname/d"
 
 ### restart services
-#for service in php5-fpm memcached mysql nginx
-for service in php5-fpm memcached mysql nginx apache2
-do
-    if test -f /etc/supervisor/conf.d/$service.conf
-    then
-        supervisorctl restart $service
-    fi
-done
+/etc/init.d/mysql restart
+/etc/init.d/apache2 restart
+#/etc/init.d/php5-fpm restart
+#/etc/init.d/memcached restart
+#/etc/init.d/nginx restart

dev/install-sshd.sh

@@ -9,11 +9,7 @@ mkdir -p /var/run/sshd/
 ### change the port
 port=${1:-2201}
 sed -i /etc/ssh/sshd_config -e "/^Port/c Port $port"
-
-### enable and start the service
-mv /etc/supervisor/conf.d/sshd.conf{.disabled,}
-supervisorctl reload
-supervisorctl start sshd
+/etc/init.d/ssh restart
 
 ### generate public/private keys
 mkdir ~/.ssh

dev/reinstall.sh

@@ -29,4 +29,4 @@ cd $code_dir/install/scripts/
 $code_dir/install/config.sh
 
 ### restart mysql
-supervisorctl restart mysql
+/etc/init.d/mysql restart

dev/webserver.sh

@@ -3,11 +3,11 @@
 
 case $1 in
     apache2 )
-        supervisorctl stop nginx
-        supervisorctl stop php5-fpm
+        /etc/init.d/nginx stop
+        /etc/init.d/php5-fpm stop
 
         drush @local_bcl -y dis memcache
-        supervisorctl stop memcached
+        /etc/init.d/memcached stop
         for file in $(ls /var/www/bcl*/sites/default/settings.php)
         do
             sed -i $file -e "/comment memcache config/ d"
@@ -16,33 +16,31 @@ case $1 in
                 -e "/'memcache_key_prefix'/a comment memcache config */"
         done
 
-        mv /etc/supervisor/conf.d/nginx.conf{,.disabled}
-        mv /etc/supervisor/conf.d/php5-fpm.conf{,.disabled}
-        mv /etc/supervisor/conf.d/memcached.conf{,.disabled}
-        mv /etc/supervisor/conf.d/apache2.conf{.disabled,}
-        supervisorctl reload
+        update-rc.d nginx disable
+        update-rc.d php5-fpm disable
+        update-rc.d memcached disable
 
-        supervisorctl start apache2
+        update-rc.d apache2 enable
+        /etc/init.d/apache2 start
         ;;
 
     nginx )
-        supervisorctl stop apache2
+        /etc/init.d/apache2 stop
 
-        mv /etc/supervisor/conf.d/apache2.conf{,.disabled}
-        mv /etc/supervisor/conf.d/nginx.conf{.disabled,}
-        mv /etc/supervisor/conf.d/php5-fpm.conf{.disabled,}
-        mv /etc/supervisor/conf.d/memcached.conf{.disabled,}
-        supervisorctl reload
+        update-rc.d apache2 disable
+        update-rc.d nginx enable
+        update-rc.d php5-fpm enable
+        update-rc.d memcached enable
 
         for file in $(ls /var/www/bcl*/sites/default/settings.php)
         do
             sed -i $file -e "/comment memcache config/ d"
         done
-        supervisorctl start memcached
+        /etc/init.d/memcached start
         drush @local_bcl -y en memcache
 
-        supervisorctl start php5-fpm
-        supervisorctl start nginx
+        /etc/init.d/php5-fpm start
+        /etc/init.d/nginx start
         ;;
     *)
         echo " * Usage: $0 {apache2 | nginx}"

docker-build.sh

@@ -0,0 +1,80 @@
+#!/bin/bash -x
+### Build a docker image.
+
+function usage {
+    echo "
+Usage: $0 [<settings> options]
+Install the project inside a container.
+
+    <settings>      file of installation/configuration settings
+    --git_branch=G  git branch that will be installed
+    --opt_name=V    override any settings in the previous config files
+
+Examples:
+    $0 --git_branch=test
+    $0 settings.sh --domain=example1.org --admin_passwd=xyz
+    $0 gmail_settings.sh passwords.sh
+"
+    exit 0
+}
+
+### Get the project directory.
+project_dir=$(dirname $0)
+
+### collect in a file all the settings and options
+options=$project_dir/options.sh
+cat <<EOF > $options
+#!/bin/bash
+### This file contains all the settings
+### and options given from the command line.
+
+EOF
+
+### save the default settings
+echo "### Start: $project_dir/install/settings.sh" >> $options
+cat $project_dir/install/settings.sh >> $options
+echo "### End: $project_dir/install/settings" >> $options
+
+### get command line options and save them to options.sh
+for opt in "$@"
+do
+    case $opt in
+	--git_branch=*)  git_branch=${opt#*=} ;;
+	-h|--help)       usage ;;
+        --*=*)
+	    optvalue=${opt#*=}
+	    optname=${opt%%=*}
+	    optname=${optname:2}
+	    echo $optname="$optvalue" >> $options
+	    ;;
+	*)
+	    if [ ${opt:0:1} = '-' ]; then usage; fi
+
+	    settings=$opt
+	    if ! test -f "$settings"
+            then
+		echo "File '$settings' does not exist."
+		exit 1
+	    fi
+	    echo "### Start: $settings" >> $options
+	    cat $settings >> $options
+	    echo "### End: $settings" >> $options
+	    ;;
+    esac
+done
+
+### make sure that we are using the right git branch
+git_branch=${git_branch:-master}
+current_dir=$(pwd)
+cd $project_dir/
+git checkout $git_branch
+git pull
+cd $current_dir
+
+### start building and logging
+project=$(basename $(ls $project_dir/*.info | sed -e 's/\.info$//'))
+nohup_out=nohup-$project-$git_branch.out
+rm -f $nohup_out
+nohup nice docker build --tag=$project:$git_branch $project_dir/ > $nohup_out &
+sleep 1
+tail -f $nohup_out

install/chroot.sh

@@ -12,7 +12,14 @@ if [ -z "${gmail_account+xxx}" -o "$gmail_account" = '' ]
 then
     gmail_account='[email protected]'
     read -p "Enter the gmail address [$gmail_account]: " input
-    gmail_account=${input:-$gmail_account}
+    gmail_account=$input
+fi
+
+if [ "$gmail_account" = '' ]
+then
+    echo "Skipping configuration of gmail account."
+    echo -e "You can do it later by calling:\n    $0"
+    exit 0
 fi
 
 if [ -z "${gmail_passwd+xxx}" -o "$gmail_passwd" = '' ]
@@ -45,6 +52,3 @@ echo "Modifying drupal variables that are used for sending email..."
 $(dirname $0)/mysqld.sh start
 drush --yes @local_bcl php-script $(dirname $0)/gmailsmtp.php  \
     "$gmail_account" "$gmail_passwd"
-
-### drush may create css/js files with wrong(root) permissions
-chown www-data: -R /var/www/bcl*/sites/default/files/{css,js}