Merge branch 'master' of http://git.hudongtang.cn/chenhuan/docker

base-images/nginx-php-fpm-main/Dockerfile

@@ -212,6 +212,7 @@ RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repo
     # docker-php-ext-install iconv pdo_mysql pdo_sqlite pgsql pdo_pgsql mysqli gd exif intl xsl json soap dom zip opcache && \
     docker-php-ext-install  pdo_mysql mysqli pdo_sqlite pgsql pdo_pgsql exif intl xsl soap zip && \
     pecl install mongodb  && \
+    echo "extension=mongodb.so" > /usr/local/etc/php/conf.d/mongodb.ini && \
     pecl install xdebug-3.1.4 && \
     pecl install -o -f redis && \
     echo "extension=redis.so" > /usr/local/etc/php/conf.d/redis.ini && \
@@ -288,7 +289,7 @@ ADD src/ /var/www/html/
 ADD errors/ /var/www/errors
 
 
-EXPOSE 443 80
+EXPOSE 443 80 8080
 
 WORKDIR "/var/www/html"
 CMD ["/start.sh"]

base-images/nginx-php-fpm-main/conf/nginx-site.conf

 server {
-	listen   80; ## listen for ipv4; this line is default and implied
-	listen   [::]:80 default ipv6only=on; ## listen for ipv6
+	listen   8080; ## listen for ipv4; this line is default and implied
+	listen   [::]:8080 default ipv6only=on; ## listen for ipv6
 
-	root /var/www/html;
+	root /var/www/html/public;
 	index index.php index.html index.htm;
 
 	# Make site accessible from http://localhost/
@@ -26,10 +26,8 @@ server {
         }
 
    location / {
-		# First attempt to serve request as file, then
-		# as directory, then fall back to index.html
-		try_files $uri $uri/ =404;
-	}
+    try_files $uri $uri/ /index.php?$query_string;
+}
 
 	error_page 404 /404.html;
         location = /404.html {

base-images/nginx-php-fpm-main/conf/nginx.conf

 #user  nobody;
+user www-data;
 worker_processes auto;
 worker_rlimit_nofile 51200;
 

base-images/nginx-php-fpm-main/scripts/start.sh

@@ -34,51 +34,51 @@ if [ ! -z "$OPcache" ]; then
  sed -i 's#zend_extension=opcache#;zend_extension=opcache#g' /usr/local/etc/php/php.ini
 fi
 
-# Setup git variables
-if [ ! -z "$GIT_EMAIL" ]; then
- git config --global user.email "$GIT_EMAIL"
-fi
-if [ ! -z "$GIT_NAME" ]; then
- git config --global user.name "$GIT_NAME"
- git config --global push.default simple
-fi
-
-# Dont pull code down if the .git folder exists
-if [ ! -d "/var/www/html/.git" ]; then
- # Pull down code from git for our site!
- if [ ! -z "$GIT_REPO" ]; then
-   # Remove the test index file if you are pulling in a git repo
-   if [ ! -z ${REMOVE_FILES} ] && [ ${REMOVE_FILES} == 0 ]; then
-     echo "skiping removal of files"
-   else
-     rm -Rf /var/www/html/*
-   fi
-   GIT_COMMAND='git clone '
-   if [ ! -z "$GIT_BRANCH" ]; then
-     GIT_COMMAND=${GIT_COMMAND}" -b ${GIT_BRANCH}"
-   fi
-
-   if [ -z "$GIT_USERNAME" ] && [ -z "$GIT_PERSONAL_TOKEN" ]; then
-     GIT_COMMAND=${GIT_COMMAND}" ${GIT_REPO}"
-   else
-    if [[ "$GIT_USE_SSH" == "1" ]]; then
-      GIT_COMMAND=${GIT_COMMAND}" ${GIT_REPO}"
-    else
-      GIT_COMMAND=${GIT_COMMAND}" https://${GIT_USERNAME}:${GIT_PERSONAL_TOKEN}@${GIT_REPO}"
-    fi
-   fi
-   ${GIT_COMMAND} /var/www/html || exit 1
-   if [ ! -z "$GIT_TAG" ]; then
-     git checkout ${GIT_TAG} || exit 1
-   fi
-   if [ ! -z "$GIT_COMMIT" ]; then
-     git checkout ${GIT_COMMIT} || exit 1
-   fi
-   if [ -z "$SKIP_CHOWN" ]; then
-     chown -Rf nginx.nginx /var/www/html
-   fi
- fi
-fi
+# # Setup git variables
+# if [ ! -z "$GIT_EMAIL" ]; then
+#  git config --global user.email "$GIT_EMAIL"
+# fi
+# if [ ! -z "$GIT_NAME" ]; then
+#  git config --global user.name "$GIT_NAME"
+#  git config --global push.default simple
+# fi
+
+# # Dont pull code down if the .git folder exists
+# if [ ! -d "/var/www/html/.git" ]; then
+#  # Pull down code from git for our site!
+#  if [ ! -z "$GIT_REPO" ]; then
+#   # Remove the test index file if you are pulling in a git repo
+#   if [ ! -z ${REMOVE_FILES} ] && [ ${REMOVE_FILES} == 0 ]; then
+#      echo "skiping removal of files"
+#   else
+#      rm -Rf /var/www/html/*
+#   fi
+#   GIT_COMMAND='git clone '
+#   if [ ! -z "$GIT_BRANCH" ]; then
+#      GIT_COMMAND=${GIT_COMMAND}" -b ${GIT_BRANCH}"
+#   fi
+
+#   if [ -z "$GIT_USERNAME" ] && [ -z "$GIT_PERSONAL_TOKEN" ]; then
+#      GIT_COMMAND=${GIT_COMMAND}" ${GIT_REPO}"
+#   else
+#     if [[ "$GIT_USE_SSH" == "1" ]]; then
+#       GIT_COMMAND=${GIT_COMMAND}" ${GIT_REPO}"
+#     else
+#       GIT_COMMAND=${GIT_COMMAND}" https://${GIT_USERNAME}:${GIT_PERSONAL_TOKEN}@${GIT_REPO}"
+#     fi
+#   fi
+#   ${GIT_COMMAND} /var/www/html || exit 1
+#   if [ ! -z "$GIT_TAG" ]; then
+#      git checkout ${GIT_TAG} || exit 1
+#   fi
+#   if [ ! -z "$GIT_COMMIT" ]; then
+#      git checkout ${GIT_COMMIT} || exit 1
+#   fi
+#   if [ -z "$SKIP_CHOWN" ]; then
+#      chown -Rf nginx.nginx /var/www/html
+#   fi
+#  fi
+# fi
 
 # Enable custom nginx config files if they exist
 if [ -f /var/www/html/conf/nginx/nginx.conf ]; then
@@ -123,18 +123,18 @@ if [[ "$REAL_IP_HEADER" == "1" ]] ; then
  fi
 fi
 # Do the same for SSL sites
-if [ -f /etc/nginx/sites-available/default-ssl.conf ]; then
- if [[ "$REAL_IP_HEADER" == "1" ]] ; then
-  sed -i "s/#real_ip_header X-Forwarded-For;/real_ip_header X-Forwarded-For;/" /etc/nginx/sites-available/default-ssl.conf
-  sed -i "s/#set_real_ip_from/set_real_ip_from/" /etc/nginx/sites-available/default-ssl.conf
-  if [ ! -z "$REAL_IP_FROM" ]; then
-   sed -i "s#172.16.0.0/12#$REAL_IP_FROM#" /etc/nginx/sites-available/default-ssl.conf
-  fi
- fi
-fi
+# if [ -f /etc/nginx/sites-available/default-ssl.conf ]; then
+#  if [[ "$REAL_IP_HEADER" == "1" ]] ; then
+#   sed -i "s/#real_ip_header X-Forwarded-For;/real_ip_header X-Forwarded-For;/" /etc/nginx/sites-available/default-ssl.conf
+#   sed -i "s/#set_real_ip_from/set_real_ip_from/" /etc/nginx/sites-available/default-ssl.conf
+#   if [ ! -z "$REAL_IP_FROM" ]; then
+#   sed -i "s#172.16.0.0/12#$REAL_IP_FROM#" /etc/nginx/sites-available/default-ssl.conf
+#   fi
+#  fi
+# fi
 
 # Set the desired timezone
-echo date.timezone=$(cat /etc/TZ) > /usr/local/etc/php/conf.d/timezone.ini
+#echo date.timezone=$(cat /etc/TZ) > /usr/local/etc/php/conf.d/timezone.ini
 
 # Display errors in docker logs
 if [ ! -z "$PHP_ERRORS_STDERR" ]; then
@@ -157,51 +157,51 @@ if [ ! -z "$PHP_UPLOAD_MAX_FILESIZE" ]; then
  sed -i "s/upload_max_filesize = 100M/upload_max_filesize= ${PHP_UPLOAD_MAX_FILESIZE}M/g" /usr/local/etc/php/conf.d/docker-vars.ini
 fi
 
-# Enable xdebug
-XdebugFile='/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini'
-if [[ "$ENABLE_XDEBUG" == "1" ]] ; then
-  if [ -f $XdebugFile ]; then
-  	echo "Xdebug enabled"
-  else
-  	echo "Enabling xdebug"
-  	echo "If you get this error, you can safely ignore it: /usr/local/bin/docker-php-ext-enable: line 83: nm: not found"
-  	# see https://github.com/docker-library/php/pull/420
-    docker-php-ext-enable xdebug
-    # see if file exists
-    if [ -f $XdebugFile ]; then
-        # See if file contains xdebug text.
-        if grep -q xdebug.remote_enable "$XdebugFile"; then
-            echo "Xdebug already enabled... skipping"
-        else
-            echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > $XdebugFile # Note, single arrow to overwrite file.
-            echo "xdebug.remote_enable=1 "  >> $XdebugFile
-            echo "xdebug.remote_host=host.docker.internal" >> $XdebugFile
-            echo "xdebug.remote_log=/tmp/xdebug.log"  >> $XdebugFile
-            echo "xdebug.remote_autostart=false "  >> $XdebugFile # I use the xdebug chrome extension instead of using autostart
-            # NOTE: xdebug.remote_host is not needed here if you set an environment variable in docker-compose like so `- XDEBUG_CONFIG=remote_host=192.168.111.27`.
-            #       you also need to set an env var `- PHP_IDE_CONFIG=serverName=docker`
-        fi
-    fi
-  fi
-else
-    if [ -f $XdebugFile ]; then
-        echo "Disabling Xdebug"
-      rm $XdebugFile
-    fi
-fi
-
-if [ ! -z "$PUID" ]; then
-  if [ -z "$PGID" ]; then
-    PGID=${PUID}
-  fi
-  deluser nginx
-  addgroup -g ${PGID} nginx
-  adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx -u ${PUID} nginx
-else
-  if [ -z "$SKIP_CHOWN" ]; then
-    chown -Rf nginx.nginx /var/www/html
-  fi
-fi
+# # Enable xdebug
+# XdebugFile='/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini'
+# if [[ "$ENABLE_XDEBUG" == "1" ]] ; then
+#   if [ -f $XdebugFile ]; then
+#   	echo "Xdebug enabled"
+#   else
+#   	echo "Enabling xdebug"
+#   	echo "If you get this error, you can safely ignore it: /usr/local/bin/docker-php-ext-enable: line 83: nm: not found"
+#   	# see https://github.com/docker-library/php/pull/420
+#     docker-php-ext-enable xdebug
+#     # see if file exists
+#     if [ -f $XdebugFile ]; then
+#         # See if file contains xdebug text.
+#         if grep -q xdebug.remote_enable "$XdebugFile"; then
+#             echo "Xdebug already enabled... skipping"
+#         else
+#             echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > $XdebugFile # Note, single arrow to overwrite file.
+#             echo "xdebug.remote_enable=1 "  >> $XdebugFile
+#             echo "xdebug.remote_host=host.docker.internal" >> $XdebugFile
+#             echo "xdebug.remote_log=/tmp/xdebug.log"  >> $XdebugFile
+#             echo "xdebug.remote_autostart=false "  >> $XdebugFile # I use the xdebug chrome extension instead of using autostart
+#             # NOTE: xdebug.remote_host is not needed here if you set an environment variable in docker-compose like so `- XDEBUG_CONFIG=remote_host=192.168.111.27`.
+#             #       you also need to set an env var `- PHP_IDE_CONFIG=serverName=docker`
+#         fi
+#     fi
+#   fi
+# else
+#     if [ -f $XdebugFile ]; then
+#         echo "Disabling Xdebug"
+#       rm $XdebugFile
+#     fi
+# fi
+
+# if [ ! -z "$PUID" ]; then
+#   if [ -z "$PGID" ]; then
+#     PGID=${PUID}
+#   fi
+#   deluser nginx
+#   addgroup -g ${PGID} nginx
+#   adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx -u ${PUID} nginx
+# else
+#   if [ -z "$SKIP_CHOWN" ]; then
+#     chown -Rf nginx.nginx /var/www/html
+#   fi
+# fi
 
 # Run custom scripts
 if [[ "$RUN_SCRIPTS" == "1" ]] ; then
@@ -218,18 +218,18 @@ if [[ "$RUN_SCRIPTS" == "1" ]] ; then
   fi
 fi
 
-if [ -z "$SKIP_COMPOSER" ]; then
-    # Try auto install for composer
-    if [ -f "/var/www/html/composer.lock" ]; then
-        if [ "$APPLICATION_ENV" == "development" ]; then
-            composer global require hirak/prestissimo
-            composer install --working-dir=/var/www/html
-        else
-            composer global require hirak/prestissimo
-            composer install --no-dev --working-dir=/var/www/html
-        fi
-    fi
-fi
+# if [ -z "$SKIP_COMPOSER" ]; then
+#     # Try auto install for composer
+#     if [ -f "/var/www/html/composer.lock" ]; then
+#         if [ "$APPLICATION_ENV" == "development" ]; then
+#             composer global require hirak/prestissimo
+#             composer install --working-dir=/var/www/html
+#         else
+#             composer global require hirak/prestissimo
+#             composer install --no-dev --working-dir=/var/www/html
+#         fi
+#     fi
+# fi
 
 # Start supervisord and services
 exec /usr/bin/supervisord -n -c /etc/supervisord.conf