Merge branch 'master' into service/memcached

# Conflicts:
#	Dockerfiles/php-fpm/Dockerfile

Author: cscolabear

.gitignore

@@ -1,10 +1,4 @@
-# Ignore everything
-/*
+.env
 
-#
-!.gitignore
-!.editorconfig
-!README.md
-!docker-compose.yml
-!/Logs/
-!/Dockerfiles/
+.DS_Store
+.vscode/*

Database/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

Dockerfiles/php-fpm/Dockerfile

@@ -12,6 +12,8 @@ RUN set -xe; \
     apt-utils \
     unzip \
     curl \
+    libzip-dev \
+    zip \
     libmemcached-dev \
     zlib1g-dev \
     libz-dev \
@@ -35,7 +37,17 @@ RUN set -xe; \
     docker-php-ext-install opcache && \
     docker-php-ext-enable opcache && \
     docker-php-ext-enable redis && \
-    docker-php-ext-enable xdebug
+    docker-php-ext-enable xdebug && \
+    docker-php-ext-configure zip --with-libzip && \
+    docker-php-ext-install zip
+
+
+# install, upgrade openssl
+RUN apt-get update -yqq \
+ && apt-get install -y --no-install-recommends openssl \
+ && sed -i 's,^\(MinProtocol[ ]*=\).*,\1'TLSv1.0',g' /etc/ssl/openssl.cnf \
+ && sed -i 's,^\(CipherString[ ]*=\).*,\1'DEFAULT@SECLEVEL=1',g' /etc/ssl/openssl.cnf\
+ && rm -rf /var/lib/apt/lists/*
 
 
 
@@ -56,15 +68,6 @@ RUN curl -fsSL 'https://github.com/websupport-sk/pecl-memcache/archive/NON_BLOCK
 
 
 
-# install zip extensions
-# ps. next lines are here becase there is no auto build on docker
-RUN apt-get install -y --no-install-recommends \
-    libzip-dev \
-    zip \
-    && docker-php-ext-configure zip --with-libzip \
-    && docker-php-ext-install zip
-
-
 COPY ./pool.conf /usr/local/etc/php-fpm.d/pool.conf
 
 

README.md

@@ -1,8 +1,11 @@
+> ![preview](https://user-images.githubusercontent.com/4863629/75411880-c332be00-595b-11ea-8490-aa8389a4636d.png)
+
 # Docker Compose for local development
 
 > - https ready!
 > - multiple domain / project support
 > - PHP Xdebug
+> - php7wrapper
 >
 > reference from https://laradock.io
 
@@ -14,8 +17,8 @@
    - [Change PHP Configuration](#change-php-configuration)
  - [Information](#info)
    - ...
-   - [docker image size preview](#docker-image-size)
 - [Xdebug & VSCode](#xdebug--vscode)
+- [PHP Wrapper](#php-wrapper)
 
 # Setup
 - #### download & install docker for MAX(os x)
@@ -26,9 +29,10 @@
   >```bash
   >$ git clone https://github.com/cscolabear/docker-dev.git Projects
   >
-  > # [optional] change branch, if you need mysql
+  > # [optional] create your local branch e.g. local-dev, and merge branch, if you need mysql or memcached
   > $ git checkout service/add-mysql
   > ```
+
 - #### make your folder look like this... (👉 replace `~/Projects` what you want.)
   > e.g.
   >
@@ -44,19 +48,22 @@
   > ```bash
   > $ cd ~/Projects
   > $ chmod -R 755 Logs
-  > $ dokcer-compose up -d
+  > $ dokcer-compose --compatibility up -d
   > ```
+  > (Compatibility mode: https://docs.docker.com/compose/compose-file/compose-versioning/#compatibility-mode)
+  >
   >
   > ⏳ Please wait
+  >
 
 - #### SSH into a container
   > ```bash
-  > $ cd ~/Projects/ && clear && docker-compose exec workspace bash
+  > $ cd ~/Projects/ && clear && docker-compose exec WORKSPACE bash
   > ```
   >
   > looked like after connected~
   > ![docker-for-local-dev-ssh-into](https://user-images.githubusercontent.com/4863629/56189375-60457a80-605a-11e9-9e6d-7a948d339a4c.png)
-  > you can execute composer, node, npm in here
+  > you can execute composer, node, npm in this container
 
 - #### enjoy Docker 🐳
   > 👉 create index.php & index.html
@@ -111,7 +118,7 @@
   > - modify `Dockerfiles/php-fpm/php.ini`
   > - restart php-fpm Docker Container
   > ```base
-  > $ docker-compose restart fpm
+  > $ docker-compose restart FPM
   >```
 
 ## Info
@@ -136,11 +143,6 @@
   >
   > ~/Projects/Logs/nginx-error.log
 
-- #### docker image size
-  > ![docker-image-size](https://user-images.githubusercontent.com/4863629/58860143-0d915200-86de-11e9-9b5a-d4cf688a230d.png)
-
-
-
 - #### Xdebug & VSCode
   > - install the vscode extension <br>
   > - PHP Debug
@@ -175,12 +177,33 @@
   > ```
 
   - vscode debug 設定檔每個專案都要設定一次<br>
-  - 路徑對應重點, 編輯器沒反應時(e.g. vscode) 多半是這個路徑沒有設定正確<br>
-    也可以 ssh 至 fpm container 查看 `/tmp/xdebug.log`<br>
+  - 路徑對應是重點(pathMappings), 編輯器沒反應時(e.g. vscode) 多半是這個路徑沒有設定正確<br>
+    也可以 ssh 進入 fpm container 查看 `/tmp/xdebug.log`<br>
     >```
     > "pathMappings": {
     >     "/var/www": "${workspaceRoot}"
     >     // or
     >     "/var/www/[your Project folder]": "${workspaceRoot}"
     > },
-    >```
+    >```
+    >
+  > - xdebug.ini
+  > ; for MAC os x
+  > xdebug.remote_host=host.docker.internal
+  >
+
+# PHP Wrapper
+ > branch exposure-php 內的 php7wrapper (https://github.com/cscolabear/docker-dev/blob/exposure-php/php7wrapper)
+
+ 因為本機 MAC os x 和 docker 環境內的 PHP 版本不同
+ 所以利用 `php7wrapper` 曝光 docker 內的 php 讓本機開發與執行使用同樣的 php 版本
+
+ - 將 `exposure-php` branch merge 至 local-dev branch
+
+ ```bash
+ $ ln -s ~/Projects/php7wrapper /usr/local/bin php
+ $ chmod +x /usr/local/bin php
+ ```
+ (MAC osx 原生 PHP path: /usr/bin/php)
+
+

docker-compose.yml

@@ -9,9 +9,9 @@ services:
     ports:
       - 9000:9000
     volumes:
-      - ./:/var/www
-      - ./Dockerfiles/php-fpm/php.ini:/usr/local/etc/php/php.ini
-      - ./Dockerfiles/php-fpm/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini
+      - ${VOLUMES_DRIVER}:/var/www:delegated
+      - ./Dockerfiles/php-fpm/php.ini:/usr/local/etc/php/php.ini:ro
+      - ./Dockerfiles/php-fpm/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini:ro
     deploy:
       resources:
         limits:
@@ -37,9 +37,9 @@ services:
       - 80:80
       - 443:443
     volumes:
-      - ./:/var/www
-      - ./Logs:/var/log/nginx
-      - ./Dockerfiles/nginx/sites-enabled:/etc/nginx/sites-enabled
+      - ${VOLUMES_DRIVER}:/var/www:delegated
+      - ./Logs:/var/log/nginx:delegated
+      - ./Dockerfiles/nginx/sites-enabled:/etc/nginx/sites-enabled:ro
     depends_on:
       - FPM
     deploy:
@@ -78,17 +78,16 @@ services:
       context: ./Dockerfiles/workspace
     image: cscolabear/workspace:latest
     ports:
-      - "22:22"
+      - "3000"
     volumes:
-      - ./:/var/www
+      - ${VOLUMES_DRIVER}:/var/www:delegated
     depends_on:
       - FPM
       - MEMCACHED
     restart: on-failure
     extra_hosts:
       - "localhost:172.16.1.50"
       # - "any-your-project-domain:172.16.1.50"
-    tty: true
     networks:
       app_net:
         ipv4_address: 172.16.1.30

env-example

@@ -0,0 +1,6 @@
+#
+# DockerDev Variables
+#
+
+# e.g. /Users/USER_NAME/Projects
+VOLUMES_DRIVER=

phpWrapper

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# https://gist.github.com/mihow/9c7f559807069a03e302605691f85572
+# Local .env
+if [ -f .env ]; then
+    # Load Environment Variables
+    export $(cat .env | grep -v '#' | awk '/=/ {print $1}')
+    # For instance, will be example_kaggle_key
+    echo $KAGGLE_KEY
+fi
+
+docker run --rm -i \
+    -v $VOLUMES_DRIVER:/var/www \
+    cscolabear/7.2-fpm php "$@"