Merge pull request #14 from ModestCoders/upgrade-libsodium-1.0.18

add libsodium to php 7.1 image, and upgrade libsodiuim for php 7.2 image

Author: danielozano

CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.4.1] - 2020-01-05
+### Added
+- Added libsodium to php 7.1 image.
+
+### Changed
+- Upgraded libsodium library to version 1.0.18.
+
 ## [1.4.0] - 2019-09-26
 ### Added
  - Added elasticsearch image

php/7.1-fpm/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.1-fpm
 MAINTAINER Juan Alonso <juan.jalogut@gmail.com>
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
   cron \
   git \
   gzip \
@@ -17,6 +17,7 @@ RUN apt-get update && apt-get install -y \
   zip \
   procps \
   sudo \
+  libsodium-dev \
   && rm -rf /var/lib/apt/lists/*
 
 RUN docker-php-ext-configure \
@@ -35,6 +36,22 @@ RUN docker-php-ext-install \
   xsl \
   zip
 
+# Remove libsodium and install upgrading version:
+RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
+  && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
+  && apt-get remove libsodium* -y  \
+  && mkdir -p /tmp/libsodium  \
+  && curl -sL https://github.com/jedisct1/libsodium/archive/1.0.18-RELEASE.tar.gz | tar xzf - -C  /tmp/libsodium \
+  && cd /tmp/libsodium/libsodium-1.0.18-RELEASE/ \
+  && ./configure \
+  && make && make check \
+  && make install  \
+  && cd / \
+  && rm -rf /tmp/libsodium  \
+  && pecl install -o -f libsodium
+
+RUN docker-php-ext-enable sodium
+
 RUN pecl channel-update pecl.php.net \
   && pecl install xdebug \
   && docker-php-ext-enable xdebug \

php/7.2-fpm/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.2-fpm
 MAINTAINER Juan Alonso <juan.jalogut@gmail.com>
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
   cron \
   git \
   gzip \
@@ -34,6 +34,20 @@ RUN docker-php-ext-install \
   xsl \
   zip
 
+# Remove libsodium and install upgrading version:
+RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
+  && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
+  && apt-get remove libsodium* -y  \
+  && mkdir -p /tmp/libsodium  \
+  && curl -sL https://github.com/jedisct1/libsodium/archive/1.0.18-RELEASE.tar.gz | tar xzf - -C  /tmp/libsodium \
+  && cd /tmp/libsodium/libsodium-1.0.18-RELEASE/ \
+  && ./configure \
+  && make && make check \
+  && make install  \
+  && cd / \
+  && rm -rf /tmp/libsodium  \
+  && pecl install -o -f libsodium
+
 RUN docker-php-ext-enable sodium
 
 RUN pecl channel-update pecl.php.net \