Merge pull request #834 from xbojch/libicu-dev-not-found

Run apt-get update before installing intl extension
upgrade base images for php-fpm and workspace.
2017-04-20 13:46:02 -04:00 · 2017-04-20 13:45:04 -04:00 · 2017-04-20 13:14:52 -04:00 · 2017-04-20 20:25:14 +08:00 · 2017-04-20 13:46:38 +02:00
8 changed files with 18 additions and 17 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -435,6 +435,7 @@ services:
        - postgres
      networks:
        - frontend
+        - backend

 ### ElasticSearch Container #################################

--- a/19
+++ b/19
@ -1,17 +1,16 @@
-### Application
-# Point to your application code, wish should be available at `/var/www`
+### Paths
+# Application: Point to your application code, will be available at `/var/www`.
 APPLICATION=../

-### Save Data Path (mysql redis mongo...)
+# Data: For all storage systems
 DATA_SAVE_PATH=../data

-### PHP version (Does not apply for HHVM)
-# PHP_VERSION=56
+### PHP version (Does not apply to HHVM)
+# Accepted values: 71 - 70 - 56.
 PHP_VERSION=70
-# PHP_VERSION=71

 ### PHP interpreter
-# PHP_INTERPRETER=hhvm
+# Accepted values: hhvm - php-fpm
 PHP_INTERPRETER=php-fpm

 ### WORKSPACE Container
@ -125,6 +124,9 @@ SELENIUM_PORT=4444
 ### MINIO Container
 MINIO_PORT=9000

+### ADMINER Container
+ADM_PORT=88
+
 ### PHP MY ADMIN Container
 # PMA_DB_ENGINE=mariadb
 PMA_DB_ENGINE=mysql
@ -133,9 +135,6 @@ PMA_PASSWORD=secret
 PMA_ROOT_PASSWORD=secret
 PMA_PORT=88

-### ADMINER Container
-ADM_PORT=88
-
 ### VARNISH Container
 VARNISH_CONFIG=/etc/varnish/default.vcl
 VARNISH_PORT=8080
--- a/php-fpm/Dockerfile-56
+++ b/php-fpm/Dockerfile-56
@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/php-fpm/tags/
 #

-FROM laradock/php-fpm:5.6--1.4
+FROM laradock/php-fpm:1.4-v5.6

 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>

--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/php-fpm/tags/
 #

-FROM laradock/php-fpm:7.0--1.4
+FROM laradock/php-fpm:1.4-v7.0

 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>

@ -277,7 +277,8 @@ RUN if [ ${MSSQL} = true ]; then \
 ARG INSTALL_INTL=false
 RUN if [ ${INSTALL_INTL} = true ]; then \
    # Install intl and requirements
-    apt-get install -y zlib1g-dev libicu-dev g++ && \
+    apt-get -y update \
+    && apt-get install -y zlib1g-dev libicu-dev g++ && \
    docker-php-ext-configure intl && \
    docker-php-ext-install intl \
 ;fi
--- a/php-fpm/Dockerfile-71
+++ b/php-fpm/Dockerfile-71
@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/php-fpm/tags/
 #

-FROM laradock/php-fpm:7.1--1.4
+FROM laradock/php-fpm:1.4-v7.1

 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>

--- a/workspace/Dockerfile-56
+++ b/workspace/Dockerfile-56
@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/workspace/tags/
 #

-FROM laradock/workspace:1.3
+FROM laradock/workspace:1.6

 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>

--- a/workspace/Dockerfile-70
+++ b/workspace/Dockerfile-70
@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/workspace/tags/
 #

-FROM laradock/workspace:1.3
+FROM laradock/workspace:1.6

 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>

--- a/workspace/Dockerfile-71
+++ b/workspace/Dockerfile-71
@ -11,7 +11,7 @@
 #

 # placeholder. Need change after new image would be built.
-FROM laradock/workspace:1.3
+FROM laradock/workspace:1.6

 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
Author	SHA1	Message	Date
Mahmoud Zalt	c5105c29b6	Merge pull request #834 from xbojch/libicu-dev-not-found Run apt-get update before installing intl extension	2017-04-20 13:46:02 -04:00
Mahmoud Zalt	4dda815980	upgrade base images for php-fpm and workspace. These duplicated Dockerfiles will be merged onto single Dockerfile later. The same Dockerfile will check for the PHP version variable and install the necessary softwar's accordingly.	2017-04-20 13:45:04 -04:00
Mahmoud Zalt	a6ff3d0666	Merge pull request #831 from bestlong/fix-pgadmin-host-name-not-resolve Fixing Unable to connect to postgresql server	2017-04-20 13:14:52 -04:00
Shao Yu Lung	0549936547	Fixing Unable to connect to postgresql server	2017-04-20 20:25:14 +08:00
Bojan Bedrac	407353e6eb	Run apt-get update before installing intl extension	2017-04-20 13:46:38 +02:00