Merge branch 'master' into targz-extractor

Author: ppaulis

README.md

@@ -16,7 +16,14 @@ It manages automated deployment workflows based on webhooks for your projects.
 * PHP mcrypt extension
 * sqlite or other doctrine compatible SGBD (sqlite is currently the only one officially supported)
 
-# Installation
+# Installation by Docker ( Container Service )
+
+You can use our [Docker image](https://hub.docker.com/r/continuous/deploy-agent/) as a container service.
+The container is isolated from the rest of your Server and you have not to worry about server dependencies or security.
+
+Thanks to report to [Docker-Hub documentation](https://hub.docker.com/r/continuous/deploy-agent/).
+
+# Installation by Composer
 
 * Download [Composer](https://getcomposer.org/download/): `curl -sS https://getcomposer.org/composer.phar -o composer.phar`
 * Install the Deploy Agent: `php composer.phar create-project continuousphp/deploy-agent`
@@ -124,4 +131,4 @@ Configure it as following:
 Please note that this project is released with a [Contributor Code of Conduct](http://contributor-covenant.org/version/1/2/0/).
 By participating in this project you agree to abide by its terms.
 
-Feel free to fork the project, create a feature branch, and send us a pull request!
+Feel free to fork the project, create a feature branch, and send us a pull request!

infra/docker/Dockerfile

@@ -0,0 +1,36 @@
+FROM php:7.0-apache
+
+# Set default system timezone
+RUN ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime
+
+# Install last update and php extension
+RUN apt-get update && apt-get install -y \
+    git \
+    vim \
+    bzip2 \
+    zip \
+    libbz2-dev \
+    libmcrypt-dev \
+    libicu-dev \
+    && docker-php-ext-configure mysqli \
+    && docker-php-ext-install mysqli pdo_mysql bz2 mcrypt intl
+
+# Install composer
+RUN curl -sS https://getcomposer.org/installer | php \ 
+    && mv composer.phar /usr/bin/composer  
+
+# Enable Apache Rewrite module
+RUN a2enmod rewrite
+
+# Default Vhost for developement
+COPY infra/docker/vhost.conf /etc/apache2/sites-available/000-default.conf
+
+# Implement application
+COPY . /var/app/
+
+RUN rm -rf /var/app/.git
+RUN cd /var/app; \
+    /usr/bin/composer update; \
+    ./scripts/post-create-project
+
+CMD ["apache2-foreground"]

infra/docker/docker-compose.yml

@@ -0,0 +1,12 @@
+version: '2'
+
+services:
+    cphp-deploy-agent:
+        image: continuous/deploy-agent:latest
+        ports: 
+            - 8080:80
+        volumes:
+            - ./db:/var/app/data/db
+            - ./logs:/var/app/data/logs
+            - ./packages:/var/app/data/packages
+            - ./myApplication:/mnt/applications/blueprint-cphp

infra/docker/vhost.conf

@@ -0,0 +1,8 @@
+<VirtualHost *>
+    DocumentRoot /var/app/public
+    <Directory /var/app/public>
+        DirectoryIndex index.php
+        AllowOverride All
+        Require all granted
+    </Directory>
+</VirtualHost>

module/DeployAgent/src/Task/TaskManager.php

@@ -290,11 +290,16 @@ public function activate(EventInterface $event)
         $message = 'Starting ' . $application->getName() . ' (' . $build . ')';
         $this->getLogger()->info($message);
 
+        $pwd = getcwd();
+        chdir($application->getPath() . DIRECTORY_SEPARATOR);
+
         symlink(
-            $application->getPath() . DIRECTORY_SEPARATOR . $build,
-            $application->getPath() . DIRECTORY_SEPARATOR . 'current'
+            $build,
+            'current'
         );
 
+        chdir($pwd);
+
         $application->getEventManager()->trigger($application::EVENT_AFTER_ACTIVATE);
 
         $message = $application->getName() . ' (' . $build . ') has successfully started';