Use specific image tags in docker-compose.yml file

README.md

@@ -6,7 +6,8 @@ View Dockerfiles:
 
 - [markoshust/magento-nginx (Docker Hub)](https://hub.docker.com/r/markoshust/magento-nginx/)
 	- 1.13
-		- [`latest`, `1.13`, `1.13-2`](https://github.com/markoshust/docker-magento/tree/master/images/nginx/1.13)
+		- [`latest`, `1.13`, `1.13-3`](https://github.com/markoshust/docker-magento/tree/master/images/nginx/1.13)
+		- [`1.13-2`](https://github.com/markoshust/docker-magento/tree/12.0.0/images/nginx/1.13)
 		- [`1.13-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/nginx/1.13)
 		- [`1.13-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/nginx/1.13)
 - [markoshust/magento-php (Docker Hub)](https://hub.docker.com/r/markoshust/magento-php/)
@@ -59,7 +60,7 @@ rm -rf compose .git
 git init
 ```
 
-2. Download the Magento source code to the `src` folder with: `./bin/download 2.2.2`
+2. Download the Magento source code to the `src` folder with: `./bin/download 2.2.4`
 
 3. Setup your ip loopback for proper IP resolution with Docker: `./bin/initloopback`
 
@@ -90,7 +91,7 @@ git init
 
 2. Download the Magento source code to the `src` folder with: `./bin/download 2.2.2`. Note that the default untar command is quite slow. If you want to speed that up install [7-Zip](http://www.7-zip.org/) and add it to your PATH. The script will automatically use 7-Zip if it is available.
 
-3. Copy magento into the docker container with `./bin/copymagento`. This is needed because of permission restrictions of shared data in Windows (see [Troubleshooting Docker](https://docs.docker.com/docker-for-windows/troubleshoot/#permissions-errors-on-data-directories-for-shared-volumes)). The folders `app/code`, `app/design` and `app/i18n` will however be shared with Windows for ease of development. For these folders the default permission 755 works just fine.
+3. Copy magento into the docker container with `./bin/copymagento`. This is needed because of permission restrictions of shared data in Windows (see [Troubleshooting Docker](https://docs.docker.com/docker-for-windows/troubleshoot/#permissions-errors-on-data-directories-for-shared-volumes)). The `app` folder will however be shared with Windows for ease of development. For this folder the default permission 755 works just fine.
 
 4. Add an entry to `C:\Windows\System32\drivers\etc\hosts` with your custom domain: `127.0.0.1 magento2.test` (assuming the domain  you want to setup is `magento2.test`). Be sure to use a `.test` tld, as `.localhost` and `.dev` will present issues with domain resolution.
 

compose/magento-1/docker-compose.yml

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 12.0.0
+# Version 13.0.0
 
 version: "3"
 
@@ -17,13 +17,13 @@ services:
       - sockdata:/sock
 
   phpfpm:
-    image: markoshust/magento-php:5.6-fpm
+    image: markoshust/magento-php:5.6-fpm-2
     links:
       - db
     volumes: *appvolumes
 
   cron:
-    image: markoshust/magento-php:5.6-fpm
+    image: markoshust/magento-php:5.6-fpm-2
     user: root
     command: /usr/local/bin/cronstart
     tty: true

compose/magento-1/images/nginx/Dockerfile

@@ -1,3 +1,3 @@
-FROM markoshust/magento-nginx:1.13
+FROM markoshust/magento-nginx:1.13-3
 
 COPY ./conf/default.conf /etc/nginx/conf.d/

compose/magento-2-windows/docker-compose.yml

@@ -1,11 +1,11 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 12.0.0
+# Version 13.0.0
 
 version: "3"
 
 services:
   app:
-    image: markoshust/magento-nginx:1.13
+    image: markoshust/magento-nginx:1.13-3
     ports:
       - 80:8000
     links:
@@ -13,20 +13,19 @@ services:
       - phpfpm
     volumes: &appvolumes
       - appdata:/var/www/html
-      - ./src/app/code:/var/www/html/app/code:delegated
-      - ./src/app/design:/var/www/html/app/design:delegated
-      - ./src/app/i18n:/var/www/html/app/i18n:delegated
+      - ./src/app:/var/www/html/app:delegated
       - ~/.composer:/var/www/html/var/composer_home:delegated
+      - ~/.composer:/var/www/.composer:delegated
       - sockdata:/sock
 
   phpfpm:
-    image: markoshust/magento-php:7.1-fpm
+    image: markoshust/magento-php:7.1-fpm-2
     links:
       - db
     volumes: *appvolumes
 
   cron:
-    image: markoshust/magento-php:7.1-fpm
+    image: markoshust/magento-php:7.1-fpm-2
     user: root
     command: /usr/local/bin/cronstart
     tty: true
@@ -43,6 +42,6 @@ services:
       - dbdata:/var/lib/mysql
 
 volumes:
+  appdata:
   dbdata:
   sockdata:
-  appdata:

compose/magento-2/docker-compose.yml

@@ -1,11 +1,11 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 12.0.0
+# Version 13.0.0
 
 version: "3"
 
 services:
   app:
-    image: markoshust/magento-nginx:1.13
+    image: markoshust/magento-nginx:1.13-3
     ports:
       - 80:8000
     links:
@@ -14,16 +14,17 @@ services:
     volumes: &appvolumes
       - ./src:/var/www/html:delegated
       - ~/.composer:/var/www/html/var/composer_home:delegated
+      - ~/.composer:/var/www/.composer:delegated
       - sockdata:/sock
 
   phpfpm:
-    image: markoshust/magento-php:7.1-fpm
+    image: markoshust/magento-php:7.1-fpm-2
     links:
       - db
     volumes: *appvolumes
 
   cron:
-    image: markoshust/magento-php:7.1-fpm
+    image: markoshust/magento-php:7.1-fpm-2
     user: root
     command: /usr/local/bin/cronstart
     tty: true