Bug: fix permission issues with composer access .ssh files

satrun77 · Oct 21, 2016 · dc7689d · dc7689d
1 parent b5cb1d5
commit dc7689d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/src/resources/docker/laravel/composer/Dockerfile b/src/resources/docker/laravel/composer/Dockerfile
@@ -2,4 +2,10 @@ FROM composer/composer:php5
 
 MAINTAINER Mohamed Alsharaf <[email protected]>
 
+RUN  echo "    IdentityFile /var/www/.ssh/id_rsa" >> /etc/ssh/ssh_config
+
+USER root
+
+ENV COMPOSER_HOME=/var/www/composer
+
 WORKDIR /var/www/html
diff --git a/src/resources/docker/laravel/docker-compose.yml b/src/resources/docker/laravel/docker-compose.yml
@@ -41,11 +41,10 @@ services:
   composer:
       build: ./composer/
       volumes:
-          - ~/.composer:/composer
-          - ~/.ssh:/root/.ssh
+          - ~/.composer:/var/www/composer
+          - ~/.ssh:/var/www/.ssh
           - ~/.netrc:/root/.netrc
-      volumes_from:
-          - app
+          - ./site:/var/www/html
 
   app:
       image: php:5.6-fpm

diff --git a/src/resources/docker/sample.env.yml b/src/resources/docker/sample.env.yml
@@ -51,11 +51,10 @@ files:
       composer:
           build: ./composer/
           volumes:
-              - ~/.composer:/composer
-              - ~/.ssh:/root/.ssh
+              - ~/.composer:/var/www/composer
+              - ~/.ssh:/var/www/.ssh
               - ~/.netrc:/root/.netrc
-          volumes_from:
-              - app
+              - ./site:/var/www/html
 
       solr:
           build: ./solr/

diff --git a/src/resources/docker/ss/composer/Dockerfile b/src/resources/docker/ss/composer/Dockerfile
@@ -2,4 +2,10 @@ FROM composer/composer:php5
 
 MAINTAINER Mohamed Alsharaf <[email protected]>
 
+RUN  echo "    IdentityFile /var/www/.ssh/id_rsa" >> /etc/ssh/ssh_config
+
+USER root
+
+ENV COMPOSER_HOME=/var/www/composer
+
 WORKDIR /var/www/html/public
diff --git a/src/resources/docker/ss/docker-compose.yml b/src/resources/docker/ss/docker-compose.yml
@@ -47,11 +47,10 @@ services:
   composer:
       build: ./composer/
       volumes:
-          - ~/.composer:/composer
-          - ~/.ssh:/root/.ssh
+          - ~/.composer:/var/www/composer
+          - ~/.ssh:/var/www/.ssh
           - ~/.netrc:/root/.netrc
-      volumes_from:
-          - app
+          - ./site:/var/www/html
 
   solr:
       build: ./solr/