feat: remove unnecessary volume and use WORKDIR instead

Author: kubabialy

.dockerignore

@@ -1,9 +1,6 @@
-.git
 codeship-*.yml
 deployment.env
 deployment.env.encrypted
-vendor/**
-!vendor/autoload.php
 storage/app/public/**
 storage/app/temp/**
 storage/framework/cache/**

Makefile

@@ -0,0 +1,31 @@
+build:
+	cp -R -u -p -v ./.env.example ./.env
+	docker-compose build
+
+down:
+	docker-compose down
+
+up:
+	docker-compose up -d
+	docker-compose exec platform composer run compile
+
+enter:
+	docker-compose exec platform bash
+
+pre-test:
+	docker-compose exec platform composer run pre-test
+
+test:
+	docker-compose exec platform composer run test-dev
+
+test-ci:
+	docker-compose exec platform composer run test
+
+cleanup:
+	docker-compose exec platform composer run fixlint
+
+down:
+	docker-compose down
+
+stop:
+	docker-compose stop

codeship-services.yml

@@ -3,8 +3,8 @@ build:
     image: build
     dockerfile_path: docker/build.Dockerfile
   volumes:
-    - .:/vols/src
-    - ./tmp/out:/vols/out
+    - .:/var/www
+    - ./tmp/out:/tmp/out
   cached: true
   default_cache_branch: develop
 
@@ -53,7 +53,7 @@ test/base: &_test_defaults
   build: &_test_build_defaults
     dockerfile_path: docker/test.Dockerfile
   volumes:
-    - .:/vols/src
+    - .:/var/www
   environment: &_test_env_defaults
     DB_PORT: 3306
     DB_DATABASE: ushahidi
@@ -95,14 +95,14 @@ test/php-7.3:
 aglio:
   image: humangeo/aglio
   volumes:
-    - .:/vols/src
+    - .:/var/www
 
 awscli:
   build:
     image: awscli
     dockerfile_path: docker/awscli.Dockerfile
   volumes:
-    - .:/vols/src
+    - .:/var/www
   encrypted_env_file: deployment.env.encrypted
   cached: true
 

codeship-steps.yml

@@ -17,10 +17,10 @@
     steps:
     - name: "Docs (develop)"
       service: aglio
-      command: aglio -i /vols/src/docs/api/index.apib -o /vols/src/docs/api/index.html
+      command: aglio -i /var/www/docs/api/index.apib -o /var/www/docs/api/index.html
     - name: "Deploy Docs (develop)"
       service: awscli
-      command: aws s3 sync /vols/src/docs/ s3://preview.ushahidi.com/platform/develop --acl public-read
+      command: aws s3 sync /var/www/docs/ s3://preview.ushahidi.com/platform/develop --acl public-read
 
   - name: "Deployment director"
     service: deploy

docker-compose.yml

@@ -39,7 +39,7 @@ services:
       - "80:8080"
     volumes:
       - storage-app-public:/var/www/storage/app/public
-      - ./:/vols/src
+      - .:/var/www
   platform_tasks:
     build: .
     environment:

docker/build.run.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 
 check_vols_src() {
-  if [ ! -d /vols/src ]; then
-    echo "No /vols/src with code"
+  if [ ! -d /var/www ]; then
+    echo "No /var/www with code"
     exit 1
   fi
 }
 check_vols_out() {
-  if [ ! -d /vols/out ]; then
-    echo "No /vols/out for output!"
+  if [ ! -d /var/out ]; then
+    echo "No /var/out for output!"
     exit 1
   fi
 }
@@ -27,7 +27,7 @@ function sync {
     echo "- vendor"
     echo "- tmp"
   } > /tmp/rsync_exclude
-  rsync -ar --exclude-from=/tmp/rsync_exclude --delete-during /vols/src/ ./
+  rsync -ar --exclude-from=/tmp/rsync_exclude --delete-during /var/www/ ./
 }
 
 function run_composer_install {
@@ -37,7 +37,7 @@ function run_composer_install {
 function bundle {
   check_vols_out
   local version=${GITHUB_VERSION:-${CI_BRANCH:-v0.0.0}}
-  DEST_DIR=/vols/out ./bin/release $version
+  DEST_DIR=/var/out ./bin/release $version
 }
 
 sync

docker/common.sh

@@ -17,8 +17,8 @@ function copy_external_config() {
 }
 
 function check_vols_src() {
-  if [ ! -d /vols/src ]; then
-    echo "No /vols/src with code"
+  if [ ! -d /var/www ]; then
+    echo "No /var/www with code"
     exit 1
   fi
 }
@@ -93,7 +93,7 @@ function sync {
     echo "- storage/passport/**"
     echo "- tmp"
   } > /tmp/rsync_exclude
-  rsync -ar --exclude-from=/tmp/rsync_exclude --delete-during /vols/src/ ./
+  rsync -ar --exclude-from=/tmp/rsync_exclude --delete-during /var/www/ ./
   rm -f phpunit.xml behat.yml phpspec.yml
 }
 

src/DataSource/Console/ListCommand.php

@@ -46,13 +46,14 @@ public function __construct(\Ushahidi\DataSource\DataSourceManager $sources)
     protected function getSources()
     {
         if ($source = $this->option('source')) {
-            $sources = [$source];
-        } elseif ($this->option('all')) {
-            $sources = $this->sources->getSources();
-        } else {
-            $sources = $this->sources->getEnabledSources();
+            return [$source];
+        } 
+        
+        if ($this->option('all')) {
+            return $this->sources->getSources();
         }
-        return $sources;
+
+        return $this->sources->getEnabledSources();
     }
 
     public function handle()