Added libsodium-dev, sodium PHP extension to fix issue with Magento 2.3.2 #159

CHANGELOG.md

@@ -8,15 +8,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - N/A
 
+## [23.1.0] - 2019-06-27
+
+### Added
+- `libsodium-dev` package and `sodium` PHP extension for Magento 2.3.2 support.
+- New PHP docker versions `7.1-fpm-10`, `7.2-fpm-1`
+
 ## [23.0.0] - 2019-04-02
 
 ### Added
 - Allow setup without SSH credentials.
 - Documentation for connecting to MySQL.
-- `bin/status` to check container status
+- `bin/status` to check container status.
 
 ### Updated
-- Readme for existing installs
+- Readme for existing installs.
 - `bin/dev-urn-catalog-generate` to look at `src` folder as project root.
 
 ### Fixed

README.md

@@ -46,9 +46,11 @@ View Dockerfiles:
       - [`1.13-0`](https://github.com/markshust/docker-magento/tree/11.0.0/images/nginx/1.13)
 - [markoshust/magento-php (Docker Hub)](https://hub.docker.com/r/markoshust/magento-php/)
   - 7.2
-      - [`latest`, `7.2-fpm`, `7.2-fpm-0`](https://github.com/markshust/docker-magento/tree/master/images/php/7.2)
+      - [`latest`, `7.2-fpm`, `7.2-fpm-1`](https://github.com/markshust/docker-magento/tree/master/images/php/7.2)
+      - [`7.2-fpm-0`](https://github.com/markshust/docker-magento/tree/23.0.0/images/php/7.2)
   - 7.1
-      - [`7.1-fpm`, `7.1-fpm-9`](https://github.com/markshust/docker-magento/tree/master/images/php/7.1)
+      - [`7.1-fpm`, `7.1-fpm-10`](https://github.com/markshust/docker-magento/tree/master/images/php/7.1)
+      - [`7.1-fpm-9`](https://github.com/markshust/docker-magento/tree/23.0.0/images/php/7.1)
       - [`7.1-fpm-8`](https://github.com/markshust/docker-magento/tree/17.0.1/images/php/7.1)
       - [`7.1-fpm-7`](https://github.com/markshust/docker-magento/tree/16.2.0/images/php/7.1)
       - [`7.1-fpm-6`](https://github.com/markshust/docker-magento/tree/16.0.0/images/php/7.1)
@@ -87,10 +89,10 @@ This configuration has been tested on Mac & Linux.
 Run this automated one-liner from the directory you want to install your project to:
 
 ```bash
-curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/onelinesetup | bash -s -- magento2.test 2.3.1
+curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/onelinesetup | bash -s -- magento2.test 2.3.2
 ```
 
-The `magento2.test` above defines the hostname to use, and the `2.3.1` defines the Magento version to install. Note that since we need a write to `/etc/hosts` for DNS resolution, you will be prompted for your system password during setup.
+The `magento2.test` above defines the hostname to use, and the `2.3.2` defines the Magento version to install. Note that since we need a write to `/etc/hosts` for DNS resolution, you will be prompted for your system password during setup.
 
 After the one-liner above completes running, you should be able to access your site at `https://magento2.test`.
 
@@ -105,19 +107,19 @@ Same result as the one-liner above. Just replace `magento2.test` references with
 curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/template | bash -s -- magento-2
 
 # Download the version of Magento you want to use with:
-bin/download 2.3.1
+bin/download 2.3.2
 
 # or if you'd rather install with Composer, run:
 #
 # OPEN SOURCE:
 #
 # rm -rf src
-# composer create-project --repository=https://repo.magento.com/ --ignore-platform-reqs magento/project-community-edition=2.3.1 src
+# composer create-project --repository=https://repo.magento.com/ --ignore-platform-reqs magento/project-community-edition=2.3.2 src
 #
 # COMMERCE:
 #
 # rm -rf src
-# composer create-project --repository=https://repo.magento.com/ --ignore-platform-reqs magento/project-enterprise-edition=2.3.1 src
+# composer create-project --repository=https://repo.magento.com/ --ignore-platform-reqs magento/project-enterprise-edition=2.3.2 src
 
 # Create a DNS host entry for the site:
 echo "127.0.0.1 magento2.test" | sudo tee -a /etc/hosts
@@ -178,7 +180,7 @@ open https://magento2.test
 - `bin/composer`: Run the composer binary. Ex. `bin/composer install`
 - `bin/copyfromcontainer`: Copy folders or files from container to host. Ex. `bin/copyfromcontainer vendor`
 - `bin/copytocontainer`: Copy folders or files from host to container. Ex. `bin/copytocontainer --all`
-- `bin/download`: Download & extract specific Magento version to the `src` directory. Ex. `bin/download 2.3.1`
+- `bin/download`: Download & extract specific Magento version to the `src` directory. Ex. `bin/download 2.3.2`
 - `bin/fixowns`: This will fix filesystem ownerships within the container.
 - `bin/fixperms`: This will fix filesystem permissions within the container.
 - `bin/grunt`: Run the grunt binary. Note that this runs the version from the node_modules directory for project version parity. Ex. `bin/grunt exec`

images/php/7.1/Dockerfile

@@ -1,6 +1,8 @@
 FROM php:7.1-fpm
 MAINTAINER Mark Shust <mark@shust.com>
 
+RUN echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list
+
 RUN apt-get update && apt-get install -y \
   cron \
   git \
@@ -16,6 +18,9 @@ RUN apt-get update && apt-get install -y \
   vim \
   zip
 
+RUN apt-get -t stretch-backports install -y \
+  libsodium-dev
+
 RUN docker-php-ext-configure \
   gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
 
@@ -28,6 +33,7 @@ RUN docker-php-ext-install \
   opcache \
   pdo_mysql \
   soap \
+  sodium \
   xsl \
   zip
 

images/php/7.2/Dockerfile

@@ -1,6 +1,8 @@
 FROM php:7.2-fpm
 MAINTAINER Mark Shust <mark@shust.com>
 
+RUN echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list
+
 RUN apt-get update && apt-get install -y \
   cron \
   git \
@@ -16,6 +18,9 @@ RUN apt-get update && apt-get install -y \
   vim \
   zip
 
+RUN apt-get -t stretch-backports install -y \
+  libsodium-dev
+
 RUN docker-php-ext-configure \
   gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
 
@@ -27,6 +32,7 @@ RUN docker-php-ext-install \
   opcache \
   pdo_mysql \
   soap \
+  sodium \
   xsl \
   zip