Sfoglia il codice sorgente

Add gzip and lsof packages for bin/magento support:backup scripts

Mark Shust 7 anni fa
parent
commit
ed5fe8ca4f

+ 8 - 5
README.md

@@ -12,15 +12,18 @@ View Dockerfiles:
 		- [`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/)
 	- 7.1
-		- [`latest`, `7.1-fpm`, `7.1-fpm-2`](https://github.com/markoshust/docker-magento/tree/master/images/php/7.1)
+		- [`latest`, `7.1-fpm`, `7.1-fpm-3`](https://github.com/markoshust/docker-magento/tree/master/images/php/7.1)
+		- [`7.1-fpm-2`](https://github.com/markoshust/docker-magento/tree/13.0.0/images/php/7.1)
 		- [`7.1-fpm-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/php/7.1)
 		- [`7.1-fpm-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/php/7.1)
 	- 7.0
-		- [`7.0-fpm`, `7.0-fpm-2`](https://github.com/markoshust/docker-magento/tree/master/images/php/7.0)
+		- [`7.0-fpm`, `7.0-fpm-3`](https://github.com/markoshust/docker-magento/tree/master/images/php/7.0)
+		- [`7.0-fpm-2`](https://github.com/markoshust/docker-magento/tree/13.0.0/images/php/7.0)
 		- [`7.0-fpm-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/php/7.0)
 		- [`7.0-fpm-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/php/7.0)
 	- 5.6
-		- [`5.6-fpm`, `5.6-fpm-2`](https://github.com/markoshust/docker-magento/tree/master/images/php/5.6)
+		- [`5.6-fpm`, `5.6-fpm-3`](https://github.com/markoshust/docker-magento/tree/master/images/php/5.6)
+		- [`5.6-fpm-2`](https://github.com/markoshust/docker-magento/tree/13.0.0/images/php/5.6)
 		- [`5.6-fpm-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/php/5.6)
 		- [`5.6-fpm-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/php/5.6)
 
@@ -74,6 +77,8 @@ git init
 
 ## Setup a New Magento 2 Project in Windows
 
+The following scripts are meant to run with Powershell. Note that the execution policy for scripts needs to be set accordingly [Execution policy](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/get-executionpolicy?view=powershell-6).
+
 1. Setup a new project using the Magento 2 compose skeleton:
 (Run this with a bash-like terminal)
 ```
@@ -87,8 +92,6 @@ rm -rf compose .git
 git init
 ```
 
-(The following scripts are meant to run with Powershell. Note that the execution policy for scripts needs to be set accordingly [Execution policy](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/get-executionpolicy?view=powershell-6))
-
 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 `app` folder will however be shared with Windows for ease of development. For this folder the default permission 755 works just fine.

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

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

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

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

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

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

+ 2 - 0
images/php/5.6/Dockerfile

@@ -4,12 +4,14 @@ MAINTAINER Mark Shust <mark@shust.com>
 RUN apt-get update && apt-get install -y \
   cron \
   git \
+  gzip \
   libfreetype6-dev \
   libicu-dev \
   libjpeg62-turbo-dev \
   libmcrypt-dev \
   libpng12-dev \
   libxslt1-dev \
+  lsof \
   mysql-client \
   vim \
   zip

+ 2 - 0
images/php/7.0/Dockerfile

@@ -4,12 +4,14 @@ MAINTAINER Mark Shust <mark@shust.com>
 RUN apt-get update && apt-get install -y \
   cron \
   git \
+  gzip \
   libfreetype6-dev \
   libicu-dev \
   libjpeg62-turbo-dev \
   libmcrypt-dev \
   libpng12-dev \
   libxslt1-dev \
+  lsof \
   mysql-client \
   vim \
   zip

+ 2 - 0
images/php/7.1/Dockerfile

@@ -4,12 +4,14 @@ MAINTAINER Mark Shust <mark@shust.com>
 RUN apt-get update && apt-get install -y \
   cron \
   git \
+  gzip \
   libfreetype6-dev \
   libicu-dev \
   libjpeg62-turbo-dev \
   libmcrypt-dev \
   libpng12-dev \
   libxslt1-dev \
+  lsof \
   mysql-client \
   vim \
   zip