Vincent 2 years ago
parent
commit
5ada5cc20b
3 changed files with 162 additions and 7 deletions
  1. 2 2
      .gitignore
  2. 155 0
      docker-compose-osx.yml
  3. 5 5
      docker-compose.yml

+ 2 - 2
.gitignore

@@ -4,13 +4,13 @@
 /mysqldata/*
 /metabase-data/*
 /elasticsearchdata/*
-/apps/*
+
 !/apps/.gitkeep
 /clonedb/*
 /.vagrant
 /.ssh/*
 /useruploaddata/*
-/.env
+.env
 !/.ssh/.gitkeep
 !/useruploaddata/.gitkeep
 !/.ssh/id_rsa_exploitation

+ 155 - 0
docker-compose-osx.yml

@@ -0,0 +1,155 @@
+version: '3.3'
+
+services:
+  php70:
+    volumes:
+      - php70-code:/var/www/html
+
+  admin:
+    platform: linux/amd64
+    volumes:
+      - admin-code:/home/workspace
+
+  ap2i:
+    volumes:
+      - ap2i-code:/var/www/html
+
+  app:
+    volumes:
+      - app-code:/home/workspace
+
+  app_v3:
+    volumes:
+      - app-v3-code:/home/workspace
+
+  metabase:
+    platform: linux/amd64
+
+#  es:
+#    platform: linux/amd64
+
+  phpmyadmin:
+    platform: linux/amd64
+
+  thumbor:
+    platform: linux/amd64
+
+  frames_v3:
+    volumes:
+      - frame-v3-code:/home/workspace
+
+  db:
+    volumes:
+      - ./apps/opentalent-platform/migration:/usr/src:cached
+      - mysqldata:/var/lib/mysql
+      - ./apps/env:/env:cached
+      - metabase-code:/usr/metabase:cached
+
+volumes:
+  php70-code:
+  ap2i-code:
+  admin-code:
+  app-code:
+  app-v3-code:
+  frame-v3-code:
+  metabase-code:
+
+x-mutagen:
+  sync:
+    defaults:
+      mode: "two-way-resolved"
+      ignore:
+        vcs: true
+
+    php70-code:
+      alpha: "./apps/opentalent-platform"
+      beta: "volume://php70-code"
+      configurationBeta:
+        permissions:
+          defaultFileMode: 0644
+          defaultDirectoryMode: 0755
+          defaultOwner: "id:1000"
+          defaultGroup: "id:1000"
+      ignore:
+        paths:
+          - "app/cache/*"
+          - "app/logs/*"
+          - "vendor"
+
+    ap2i-code:
+      alpha: "./apps/ap2i"
+      beta: "volume://ap2i-code"
+      configurationBeta:
+        permissions:
+          defaultFileMode: 0644
+          defaultDirectoryMode: 0755
+          defaultOwner: "id:1000"
+          defaultGroup: "id:1000"
+      ignore:
+        paths:
+          - "var/cache"
+          - "var/log"
+          - "vendor"
+
+    admin-code:
+      alpha: "./apps/opentalent-admin-2.0"
+      beta: "volume://admin-code"
+      configurationBeta:
+        permissions:
+          defaultFileMode: 0644
+          defaultDirectoryMode: 0755
+          defaultOwner: "id:1000"
+          defaultGroup: "id:1000"
+      ignore:
+        paths:
+          - "node_modules"
+          - "bower_components"
+
+    app-code:
+      alpha: "./apps/app"
+      beta: "volume://app-code"
+      configurationBeta:
+        permissions:
+          defaultFileMode: 0644
+          defaultDirectoryMode: 0755
+          defaultOwner: "id:1000"
+          defaultGroup: "id:1000"
+      ignore:
+        paths:
+          - "node_modules"
+
+    app-v3-code:
+      alpha: "./apps/app-v3"
+      beta: "volume://app-v3-code"
+      configurationBeta:
+        permissions:
+          defaultFileMode: 0644
+          defaultDirectoryMode: 0755
+          defaultOwner: "id:1000"
+          defaultGroup: "id:1000"
+      ignore:
+        paths:
+          - "node_modules"
+
+    frame-v3-code:
+      alpha: "./apps/frames_v3"
+      beta: "volume://frame-v3-code"
+      configurationBeta:
+        permissions:
+          defaultFileMode: 0644
+          defaultDirectoryMode: 0755
+          defaultOwner: "id:1000"
+          defaultGroup: "id:1000"
+      ignore:
+        paths:
+          - "node_modules"
+
+    metabase-code:
+      alpha: "./apps/metabase"
+      beta: "volume://metabase-code"
+      configurationBeta:
+        permissions:
+          defaultFileMode: 0644
+          defaultDirectoryMode: 0755
+          defaultOwner: "id:1000"
+          defaultGroup: "id:1000"

+ 5 - 5
docker-compose.yml

@@ -9,8 +9,10 @@ services:
       dockerfile: docker/nginx-proxy/Dockerfile
     restart: always
     ports:
-      - "80:80"
-      - "443:443"
+      - 80:80
+      - 443:443
+    environment:
+      TRUST_DOWNSTREAM_PROXY: true
     networks:
       - network
     volumes:
@@ -491,9 +493,7 @@ volumes:
   mysqldata: ~
   elasticsearchdata: ~
   useruploaddata: ~
-  appcache5: ~
-  applog5: ~
   appcache: ~
   applog: ~
   mercure_data: ~
-  mercure_config: ~
+  mercure_config: ~