Explorar el Código

Standardized README for regular linux environment

Mark Shust hace 9 años
padre
commit
2d02bf24ba
Se han modificado 2 ficheros con 8 adiciones y 6 borrados
  1. 5 3
      README.md
  2. 3 3
      docker-compose.yml

+ 5 - 3
README.md

@@ -19,13 +19,13 @@ Setup will create a new directory at `~/Sites/mysite/src` which will hold all of
 ```
 app:
   image: mageinferno/magento2-nginx:1.9.9-0
+  ports:
+    - "80:80"
   links:
     - php-fpm
     - db
   volumes_from:
     - appdata
-  environment:
-    - VIRTUAL_HOST=mysite.docker
 
 appdata:
   image: tianon/true
@@ -43,7 +43,7 @@ appdata:
 db:
   image: mariadb:10.0.22
   ports:
-    - "8001:3306"
+    - "3306:3306"
   volumes_from:
     - dbdata
   environment:
@@ -154,6 +154,8 @@ Then build your custom image:
 docker build -t myname/php .
 ```
 
+Remember to add your `VIRTUAL_HOST` environment variable to the web server container in your docker-compose.yml file, and remove `ports` as those are automatically exposed in Dinghy.
+
 ### Host Volumes
 
 Previously, we mounted this entire src directory from the host to the volume, but this made things pretty slow. Instead, we are now recommending mounting /src as a standard Docker volume (not connected to the host). Install Magento 2, then issue a command like the following on your host machine:

+ 3 - 3
docker-compose.yml

@@ -1,12 +1,12 @@
 app:
   image: mageinferno/magento2-nginx:1.9.9-0
+  ports:
+    - "80:80"
   links:
     - php-fpm
     - db
   volumes_from:
     - appdata
-  environment:
-    - VIRTUAL_HOST=mysite.docker
 
 appdata:
   image: tianon/true
@@ -24,7 +24,7 @@ appdata:
 db:
   image: mariadb:10.0.22
   ports:
-    - "8001:3306"
+    - "3306:3306"
   volumes_from:
     - dbdata
   environment: