Browse Source

Use simplified image versions for docker compose samples

Mark Shust 7 years ago
parent
commit
0677fc2af5

+ 2 - 2
README.md

@@ -20,9 +20,9 @@ Folders:
 - `images`: Docker images for nginx and php
 - `images`: Docker images for nginx and php
 - `compose`: sample setups with Docker Compose
 - `compose`: sample setups with Docker Compose
 
 
-Nginx assumes you are running Magento 2, however you can easily run it with Magento 1 using [the provided configuration file](https://github.com/markoshust/magento-docker/blob/master/images/nginx/1.13/conf/default.magento1.conf)
+Nginx assumes you are running Magento 2, however you can easily run it with Magento 1 using [the provided configuration file](https://github.com/markoshust/magento-docker/blob/master/images/nginx/1.13/conf/default.magento1.conf). Here is an [example of this setup with Docker Compose](https://github.com/markoshust/magento-docker/tree/master/compose/magento-1).
 
 
-The PHP images are fairly agnostic to which version of Magento you are running. The PHP 5 images do assume you are running Magento 1, and the PHP 7 images do assume you are running Magento 2, however the main difference is cronjob setup, and they can be easily modified for inverse use.
+The PHP images are fairly agnostic to which version of Magento you are running. The PHP 5 images do assume you are running Magento 1, and the PHP 7 images do assume you are running Magento 2, however the main difference is cronjob setup, and they can be easily modified for inverse usage.
 
 
 ## Prerequisites
 ## Prerequisites
 
 

+ 1 - 1
compose/magento-1/docker-compose.yml

@@ -13,7 +13,7 @@ services:
       - phpfpm
       - phpfpm
 
 
   phpfpm:
   phpfpm:
-    image: markoshust/magento-php:5.6-fpm-0
+    image: markoshust/magento-php:5.6-fpm
     links:
     links:
       - db
       - db
 
 

+ 1 - 1
compose/magento-1/images/nginx/Dockerfile

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

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

@@ -5,7 +5,7 @@ version: "3"
 
 
 services:
 services:
   app:
   app:
-    image: markoshust/magento-nginx:1.13-0
+    image: markoshust/magento-nginx:1.13
     ports:
     ports:
       - 80:80
       - 80:80
     links:
     links:
@@ -13,7 +13,7 @@ services:
       - phpfpm
       - phpfpm
 
 
   phpfpm:
   phpfpm:
-    image: markoshust/magento-php:7.1-fpm-0
+    image: markoshust/magento-php:7.1-fpm
     links:
     links:
       - db
       - db