Merge pull request #6 from devsu/dev4

Dev4

Author: angeldanielboscan

Dockerfile

@@ -43,10 +43,11 @@ RUN php5enmod mcrypt
 RUN /usr/bin/curl -sS https://getcomposer.org/installer | /usr/bin/php
 RUN /bin/mv composer.phar /usr/local/bin/composer
 
-# Install Composer and Drush
+# Install Composer and Drush 6.7
+RUN /usr/bin/curl -sS https://getcomposer.org/installer | /usr/bin/php
+RUN /bin/mv composer.phar /usr/local/bin/composer
 RUN /usr/local/bin/composer self-update
-RUN /usr/local/bin/composer global require drush/drush:6.*
-RUN ln -s /root/.composer/vendor/drush/drush/drush /usr/local/bin/drush
+RUN mkdir --parents /opt/drush-6.7 && cd /opt/drush-6.7 && composer init --require=drush/drush:6.* -n && /usr/local/bin/composer config bin-dir /usr/local/bin && /usr/local/bin/composer install
 
 # Prepare directory
 RUN mkdir /var/www

startup.sh

@@ -50,12 +50,12 @@ fi
 
 # Checking if the cron is already set up
 # Cron job written according http://www.drush.org/en/master/cron/
-CRON_JOB="root /usr/bin/env PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin COLUMNS=72 /usr/local/bin/drush --root=/var/www cron"
-CHECK=$(cat /etc/crontab | grep -o "$CRON_JOB" )
+CRON_JOB="www-data /usr/bin/env PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin COLUMNS=72 /usr/local/bin/drush --root=/var/www cron"
+CHECK=$(cat $ENV_CRON | grep -o "$CRON_JOB" )
 
 if [[ -z $CHECK ]]; then
-	echo "$CRON_SCHEDULE $CRON_JOB" >> /etc/cron.d/drupal
-	echo "$(date "+%Y-%m-%d %H:%M:%S") CRON_JOB set in /etc/crontab" >> /var/log/supervisor/cron.log
+	echo "$CRON_SCHEDULE $CRON_JOB" >> $ENV_CRON
+	echo "$(date "+%Y-%m-%d %H:%M:%S") CRON_JOB set in $ENV_CRON" >> /var/log/supervisor/cron.log
 else
 	echo "$(date "+%Y-%m-%d %H:%M:%S") CRON_JOB already created, doing nothing..." >> /var/log/supervisor/cron.log
 fi