Merge pull request #2424 from appleboy/locale

chore(php-fpm): update the default locale setting.
Merge pull request #2276 from jzonta/add_oci8_supports
2019-12-19 20:08:55 +08:00 · 2019-12-19 20:07:34 +08:00 · 2019-12-17 20:48:15 +08:00 · 2019-12-17 20:47:56 +08:00 · 2019-12-17 20:44:31 +08:00 · 2019-12-12 08:37:50 +08:00
7 changed files with 110 additions and 12 deletions
--- a/.devcontainer/devcontainer.example.json
+++ b/.devcontainer/devcontainer.example.json
@ -1,9 +1,6 @@
 {
  "name": "Laradock",
-  "dockerComposeFile": [
-    "../docker-compose.yml",
-    "docker-compose.extend.yml"
-  ],
+  "dockerComposeFile": "../docker-compose.yml",
  "remoteUser": "laradock",
  "runServices": [
    "nginx",
--- a/.devcontainer/docker-compose.extend-example.yml
+++ b/.devcontainer/docker-compose.extend-example.yml
@ -1,6 +0,0 @@
-version: '3'
-services:
-  workspace:
-    volumes:
-      - ~/.gitconfig:/home/laradock/.gitconfig
-      - ~/.ssh:/home/laradock/.ssh:ro
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@ -1500,6 +1500,13 @@ To add locales to the container:

 4 - Check enabled locales with `docker-compose exec php-fpm locale -a`

+Update the locale setting, default is `POSIX`
+
+1 - Open the `.env` file and set `PHP_FPM_DEFAULT_LOCALE` to `en_US.UTF8` or other locale you want.
+
+2 - Re-build your PHP-FPM Container `docker-compose build php-fpm`.
+
+3 - Check the default locale with `docker-compose exec php-fpm locale`


 <br>
@ -1889,7 +1896,9 @@ To install Supervisor in the Workspace container

 2 - Set `WORKSPACE_INSTALL_SUPERVISOR` and `WORKSPACE_INSTALL_PYTHON` to `true`.

-3 - Re-build the container `docker-compose build workspace` Or `docker-composer up --build -d workspace` 
+3 - Create supervisor configuration file (for ex., named `laravel-worker.conf`) for Laravel Queue Worker in `php-worker/supervisord.d/` by simply copy from `laravel-worker.conf.example`
+
+4 - Re-build the container `docker-compose build workspace` Or `docker-composer up --build -d workspace` 



--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -91,6 +91,7 @@ services:
          - INSTALL_WP_CLI=${WORKSPACE_INSTALL_WP_CLI}
          - INSTALL_DRUPAL_CONSOLE=${WORKSPACE_INSTALL_DRUPAL_CONSOLE}
          - INSTALL_AEROSPIKE=${WORKSPACE_INSTALL_AEROSPIKE}
+          - INSTALL_OCI8=${WORKSPACE_INSTALL_OCI8}
          - INSTALL_V8JS=${WORKSPACE_INSTALL_V8JS}
          - COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL}
          - COMPOSER_AUTH=${WORKSPACE_COMPOSER_AUTH}
@ -117,6 +118,8 @@ services:
          - INSTALL_MYSQL_CLIENT=${WORKSPACE_INSTALL_MYSQL_CLIENT}
          - INSTALL_PING=${WORKSPACE_INSTALL_PING}
          - INSTALL_SSHPASS=${WORKSPACE_INSTALL_SSHPASS}
+          - INSTALL_INOTIFY=${WORKSPACE_INSTALL_INOTIFY}
+          - INSTALL_FSWATCH=${WORKSPACE_INSTALL_FSWATCH}
          - INSTALL_AST=${WORKSPACE_INSTALL_AST}
          - INSTALL_YAML=${WORKSPACE_INSTALL_YAML}
          - INSTALL_MAILPARSE=${WORKSPACE_INSTALL_MAILPARSE}
@ -181,6 +184,7 @@ services:
          - INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE}
          - INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF}
          - INSTALL_AEROSPIKE=${PHP_FPM_INSTALL_AEROSPIKE}
+          - INSTALL_OCI8=${PHP_FPM_INSTALL_OCI8}
          - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
          - INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL}
          - INSTALL_PG_CLIENT=${PHP_FPM_INSTALL_PG_CLIENT}
@ -212,6 +216,7 @@ services:
          - INSTALL_XHPROF=${PHP_FPM_INSTALL_XHPROF}
          - PUID=${PHP_FPM_PUID}
          - PGID=${PHP_FPM_PGID}
+          - LOCALE=${PHP_FPM_DEFAULT_LOCALE}
          - http_proxy
          - https_proxy
          - no_proxy
--- a/3
+++ b/3
@ -118,6 +118,7 @@ WORKSPACE_DRUSH_VERSION=8.1.17
 WORKSPACE_INSTALL_DRUPAL_CONSOLE=false
 WORKSPACE_INSTALL_WP_CLI=false
 WORKSPACE_INSTALL_AEROSPIKE=false
+WORKSPACE_INSTALL_OCI8=false
 WORKSPACE_INSTALL_V8JS=false
 WORKSPACE_INSTALL_LARAVEL_ENVOY=false
 WORKSPACE_INSTALL_LARAVEL_INSTALLER=false
@ -181,6 +182,7 @@ PHP_FPM_INSTALL_XSL=false
 PHP_FPM_INSTALL_GMP=false
 PHP_FPM_INSTALL_EXIF=false
 PHP_FPM_INSTALL_AEROSPIKE=false
+PHP_FPM_INSTALL_OCI8=false
 PHP_FPM_INSTALL_PGSQL=false
 PHP_FPM_INSTALL_GHOSTSCRIPT=false
 PHP_FPM_INSTALL_LDAP=false
@ -206,6 +208,7 @@ PHP_FPM_INSTALL_SSHPASS=false
 PHP_FPM_INSTALL_MAILPARSE=false
 PHP_FPM_FFMPEG=false
 PHP_FPM_ADDITIONAL_LOCALES="es_ES.UTF-8 fr_FR.UTF-8"
+PHP_FPM_DEFAULT_LOCALE=POSIX

 PHP_FPM_PUID=1000
 PHP_FPM_PGID=1000
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@ -14,7 +14,7 @@

 ARG LARADOCK_PHP_VERSION

-FROM laradock/php-fpm:2.6.1-${LARADOCK_PHP_VERSION}
+FROM laradock/php-fpm:2.6.2-${LARADOCK_PHP_VERSION}

 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"

@ -450,6 +450,51 @@ RUN set -xe; \
    && docker-php-ext-enable aerospike \
 ;fi

+###########################################################################
+# PHP OCI8:
+###########################################################################
+
+ARG INSTALL_OCI8=false
+
+ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_12_1"
+ENV OCI_HOME="/opt/oracle/instantclient_12_1"
+ENV OCI_LIB_DIR="/opt/oracle/instantclient_12_1"
+ENV OCI_INCLUDE_DIR="/opt/oracle/instantclient_12_1/sdk/include"
+ENV OCI_VERSION=12
+
+RUN if [ ${INSTALL_OCI8} = true ]; then \
+    # Install wget
+    apt-get update && apt-get install --no-install-recommends -y wget \
+    # Install Oracle Instantclient
+    && mkdir /opt/oracle \
+        && cd /opt/oracle \
+        && wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-basic-linux.x64-12.1.0.2.0.zip \
+        && wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-sdk-linux.x64-12.1.0.2.0.zip \
+        && unzip /opt/oracle/instantclient-basic-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
+        && unzip /opt/oracle/instantclient-sdk-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
+        && ln -s /opt/oracle/instantclient_12_1/libclntsh.so.12.1 /opt/oracle/instantclient_12_1/libclntsh.so \
+        && ln -s /opt/oracle/instantclient_12_1/libclntshcore.so.12.1 /opt/oracle/instantclient_12_1/libclntshcore.so \
+        && ln -s /opt/oracle/instantclient_12_1/libocci.so.12.1 /opt/oracle/instantclient_12_1/libocci.so \
+        && rm -rf /opt/oracle/*.zip \
+    # Install PHP extensions deps
+    && apt-get update \
+        && apt-get install --no-install-recommends -y \
+            libaio-dev \
+            freetds-dev && \
+    # Install PHP extensions
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
+      echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.10; \
+    else \
+      echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8; \
+    fi \
+        && docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/opt/oracle/instantclient_12_1,12.1 \
+        && docker-php-ext-configure pdo_dblib --with-libdir=/lib/x86_64-linux-gnu \
+        && docker-php-ext-install \
+                pdo_oci \
+        && docker-php-ext-enable \
+                oci8 \
+  ;fi
+
 ###########################################################################
 # IonCube Loader:
 ###########################################################################
@ -835,6 +880,10 @@ RUN if [ ${INSTALL_FAKETIME} = true ]; then \
    echo "/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1" > /etc/ld.so.preload \
 ;fi

+# Configure locale.
+ARG LOCALE=POSIX
+ENV LC_ALL ${LOCALE}
+
 WORKDIR /var/www

 CMD ["php-fpm"]
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@ -756,6 +756,47 @@ RUN set -xe; \
    && echo 'aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua' >> /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \
  ;fi

+###########################################################################
+# PHP OCI8:
+###########################################################################
+
+USER root
+ARG INSTALL_OCI8=false
+
+ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_12_1"
+ENV OCI_HOME="/opt/oracle/instantclient_12_1"
+ENV OCI_LIB_DIR="/opt/oracle/instantclient_12_1"
+ENV OCI_INCLUDE_DIR="/opt/oracle/instantclient_12_1/sdk/include"
+ENV OCI_VERSION=12
+
+RUN if [ ${INSTALL_OCI8} = true ]; then \
+  # Install wget
+  apt-get update && apt-get install --no-install-recommends -y wget \
+  # Install Oracle Instantclient
+  && mkdir /opt/oracle \
+      && cd /opt/oracle \
+      && wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-basic-linux.x64-12.1.0.2.0.zip \
+      && wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-sdk-linux.x64-12.1.0.2.0.zip \
+      && unzip /opt/oracle/instantclient-basic-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
+      && unzip /opt/oracle/instantclient-sdk-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
+      && ln -s /opt/oracle/instantclient_12_1/libclntsh.so.12.1 /opt/oracle/instantclient_12_1/libclntsh.so \
+      && ln -s /opt/oracle/instantclient_12_1/libclntshcore.so.12.1 /opt/oracle/instantclient_12_1/libclntshcore.so \
+      && ln -s /opt/oracle/instantclient_12_1/libocci.so.12.1 /opt/oracle/instantclient_12_1/libocci.so \
+      && rm -rf /opt/oracle/*.zip \
+  # Install PHP extensions deps
+  && apt-get update \
+      && apt-get install --no-install-recommends -y \
+          libaio-dev && \
+  # Install PHP extensions
+  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
+    echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.10; \
+  else \
+    echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8; \
+  fi \
+  && echo "extension=oci8.so" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini \
+  && php -m | grep -q 'oci8' \
+;fi
+
 ###########################################################################
 # PHP V8JS:
 ###########################################################################
Author	SHA1	Message	Date
Shao Yu-Lung (Allen)	fc5ab30d4f	Merge pull request #2424 from appleboy/locale chore(php-fpm): update the default locale setting.	2019-12-19 20:08:55 +08:00
Shao Yu-Lung (Allen)	89a1ac652e	Merge pull request #2276 from jzonta/add_oci8_supports Added support for OCI8 extension in workspace and php-fpm containers.	2019-12-19 20:07:34 +08:00
Shao Yu-Lung (Allen)	d732318e52	Merge pull request #2273 from Insua/master fix(compose file): add missing config for inotify and fswatch	2019-12-17 20:48:15 +08:00
Shao Yu-Lung (Allen)	ccf85148e8	Merge branch 'master' into master	2019-12-17 20:47:56 +08:00
Shao Yu-Lung (Allen)	378900ee38	Merge pull request #2365 from amorZhu/master update document for workspace supervisor	2019-12-17 20:44:31 +08:00
Shao Yu-Lung (Allen)	e943d90ca2	Merge pull request #2427 from lbssousa/devcontainer-v3 Drop unneeded settings for devcontainer.json (VSCode already handles them automatically)	2019-12-12 08:37:50 +08:00
Laércio de Sousa	d847c1a8c5	Drop unneeded settings for devcontainer.json (VSCode already handles them automatically).	2019-12-11 15:18:34 -03:00
Shao Yu-Lung (Allen)	ace85c38d7	Merge pull request #2425 from bestlong/php-fpm-use-new-base-image php-fpm base image use 2.6.2	2019-12-12 00:13:14 +08:00
Shao Yu Lung	be48366190	php-fpm base image use 2.6.2	2019-12-11 21:18:57 +08:00
Bo-Yi Wu	a1d7d46573	chore(php-fpm): update the default locale setting. Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>	2019-12-11 14:28:14 +08:00
zhushaolong	0573bbc58a	update document for workspace supervisor	2019-11-13 14:16:47 +08:00
João Zonta	1ded4a657e	Merge branch 'add_oci8_supports' of https://github.com/jzonta/laradock into add_oci8_supports	2019-10-09 08:48:56 -03:00
João Zonta	559acc278b	Added support for OCI8 extension in workspace and php-fpm containers. PHP 5.6, 7.0, 7.1, 7.2 and 7.3	2019-09-11 23:54:29 -03:00
insua	1f2643f52c	fix(compose file): add missing config for inotify and fswatch	2019-09-11 16:59:56 +08:00