run apache as the buildkit user and switch to amp's 'none' permission…

… scheme
michaelmcandrew · Apr 2, 2018 · dd194d9 · dd194d9
1 parent e81d2fb
commit dd194d9
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/civicrm/amp.services.yml b/civicrm/amp.services.yml
@@ -2,7 +2,7 @@ parameters:
     version: 2
     db_type: mysql_dsn
     mysql_dsn: 'mysql://root:buildkit@mysql:3306'
-    perm_type: linuxAcl
+    perm_type: none
     perm_user: www-data
     hosts_type: file
     httpd_type: apache24

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,10 +3,11 @@ version: '3.4'
 services:
 
   civicrm:
-    image: michaelmcandrew/civicrm
+    build: civicrm
     hostname: civicrm
     environment:
       TERM: xterm-color
+      APACHE_RUN_USER: buildkit
     links:
       - mysql
     ports:

diff --git a/publish/civicrm/php5.6/amp.services.yml b/publish/civicrm/php5.6/amp.services.yml
@@ -2,7 +2,7 @@ parameters:
     version: 2
     db_type: mysql_dsn
     mysql_dsn: 'mysql://root:buildkit@mysql:3306'
-    perm_type: linuxAcl
+    perm_type: none
     perm_user: www-data
     hosts_type: file
     httpd_type: apache24

diff --git a/publish/civicrm/php7.0/amp.services.yml b/publish/civicrm/php7.0/amp.services.yml
@@ -2,7 +2,7 @@ parameters:
     version: 2
     db_type: mysql_dsn
     mysql_dsn: 'mysql://root:buildkit@mysql:3306'
-    perm_type: linuxAcl
+    perm_type: none
     perm_user: www-data
     hosts_type: file
     httpd_type: apache24

diff --git a/publish/civicrm/php7.1/amp.services.yml b/publish/civicrm/php7.1/amp.services.yml
@@ -2,7 +2,7 @@ parameters:
     version: 2
     db_type: mysql_dsn
     mysql_dsn: 'mysql://root:buildkit@mysql:3306'
-    perm_type: linuxAcl
+    perm_type: none
     perm_user: www-data
     hosts_type: file
     httpd_type: apache24

diff --git a/publish/civicrm/php7.2/amp.services.yml b/publish/civicrm/php7.2/amp.services.yml
@@ -2,7 +2,7 @@ parameters:
     version: 2
     db_type: mysql_dsn
     mysql_dsn: 'mysql://root:buildkit@mysql:3306'
-    perm_type: linuxAcl
+    perm_type: none
     perm_user: www-data
     hosts_type: file
     httpd_type: apache24

diff --git a/publish/templates/civicrm/amp.services.yml.twig b/publish/templates/civicrm/amp.services.yml.twig
@@ -2,7 +2,7 @@ parameters:
     version: 2
     db_type: mysql_dsn
     mysql_dsn: 'mysql://root:buildkit@mysql:3306'
-    perm_type: linuxAcl
+    perm_type: none
     perm_user: www-data
     hosts_type: file
     httpd_type: apache24