Auto reload caddy and add basicauth example (#1706)

* add live reload and basicauth

DOCUMENTATION/content/documentation/index.md

@@ -1499,10 +1499,33 @@ e) set it to `true`
 3 - Set it to `true`
 <br>
 4 - Re-build the containers `docker-compose build php-fpm`
+<br>
 
 
 
 
+<br>
+<a name="Install-Faketime"></a>
+## Install libfaketime in the php-fpm container
+Libfaketime allows you to control the date and time that is returned from the operating system.
+It can be used by specifying a special string in the `PHP_FPM_FAKETIME` variable in the `.env` file.
+For example:
+`PHP_FPM_FAKETIME=-1d`
+will set the clock back 1 day. See (https://github.com/wolfcw/libfaketime) for more information.
+
+1 - Open the `.env` file
+<br>
+2 - Search for the `PHP_FPM_INSTALL_FAKETIME` argument under the PHP-FPM container
+<br>
+3 - Set it to `true`
+<br>
+4 - Search for the `PHP_FPM_FAKETIME` argument under the PHP-FPM container
+<br>
+5 - Set it to the desired string
+<br>
+6 - Re-build the containers `docker-compose build php-fpm`<br>
+
+
 
 <br>
 <a name="phpstorm-debugging"></a>

caddy/Dockerfile

@@ -6,12 +6,14 @@ ARG plugins="cors"
 
 ## ARG plugins="cors cgi cloudflare azure linode"
 
-
 RUN caddyplug install ${plugins}
-    
+
+RUN apk add --no-cache inotify-tools \
+    && echo -e "#!/bin/sh\nwhile inotifywait -e modify /etc/caddy; do\n\tpkill caddy\ndone " >> /start.sh \
+    && chmod +x /start.sh
 
 EXPOSE 80 443 2015
 
 WORKDIR /var/www/public
 
-CMD ["/usr/bin/caddy", "-conf", "/etc/Caddyfile","-agree"]
+CMD ["sh","-c","/start.sh & /usr/bin/caddy -conf /etc/caddy/Caddyfile -agree"]

caddy/caddy/Caddyfile

@@ -44,3 +44,8 @@ laradock2.demo:80 {
     #proxy domain.com
 	#cors
 }
+
+laradock3.demo:80 {
+    import authlist.conf
+    root /var/www/public
+}

caddy/caddy/authlist.conf

@@ -0,0 +1 @@
+basicauth / laradock laradock

docker-compose.yml

@@ -52,6 +52,7 @@ services:
           - INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
           - INSTALL_PHPDBG=${WORKSPACE_INSTALL_PHPDBG}
           - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
+          - INSTALL_GMP=${WORKSPACE_INSTALL_GMP}
           - INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
           - INSTALL_LDAP=${WORKSPACE_INSTALL_LDAP}
           - INSTALL_IMAP=${WORKSPACE_INSTALL_IMAP}
@@ -144,6 +145,7 @@ services:
           - INSTALL_IMAGE_OPTIMIZERS=${PHP_FPM_INSTALL_IMAGE_OPTIMIZERS}
           - INSTALL_IMAGEMAGICK=${PHP_FPM_INSTALL_IMAGEMAGICK}
           - INSTALL_CALENDAR=${PHP_FPM_INSTALL_CALENDAR}
+          - INSTALL_FAKETIME=${PHP_FPM_INSTALL_FAKETIME}
       volumes:
         - ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini
         - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
@@ -154,6 +156,7 @@ services:
       environment:
         - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
         - DOCKER_HOST=tcp://docker-in-docker:2375
+        - FAKETIME=${PHP_FPM_FAKETIME}
       depends_on:
         - workspace
       networks:
@@ -468,7 +471,7 @@ services:
       build: ./caddy
       volumes:
         - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
-        - ${CADDY_CUSTOM_CADDYFILE}:/etc/Caddyfile
+        - ${CADDY_CONFIG_PATH}:/etc/caddy
         - ${CADDY_HOST_LOG_PATH}:/var/log/caddy
         - ${DATA_PATH_HOST}:/root/.caddy
       ports:
@@ -889,3 +892,59 @@ services:
       networks:
         - backend
 
+### IDE-THEIA ################################################
+    ide-theia:
+      build:
+        context: ./ide-theia
+      volumes:
+        - ${APP_CODE_PATH_HOST}:/home/project
+      ports:
+        - "${IDE_THEIA_PORT}:3000"
+      networks:
+        - backend
+
+### IDE-WEBIDE ################################################
+    ide-webide:
+      build:
+        context: ./ide-webide
+      volumes:
+        - ${DATA_PATH_HOST}/ide/webide/ide.db:/root/.coding-ide/ide.db
+      ports:
+        - "${IDE_WEBIDE_PORT}:8080"
+      networks:
+        - backend
+
+### IDE-CODIAD ################################################
+    ide-codiad:
+      build:
+        context: ./ide-codiad
+      environment:
+        - APP_CODE_PATH_CONTAINER=${APP_CODE_PATH_CONTAINER}
+        - TZ=${WORKSPACE_TIMEZONE}
+        - PGID=1000
+        - PUID=1000
+      volumes:
+        - /etc/localtime:/etc/localtime:ro
+        - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
+        - ${DATA_PATH_HOST}/ide/codiad:/config
+      ports:
+        - "${IDE_CODIAD_PORT}:80"
+      networks:
+        - backend
+
+### IDE-ICECODER ################################################
+    ide-icecoder:
+      build:
+        context: ./ide-icecoder
+      environment:
+        - DOCUMENT_ROOT=${APP_CODE_PATH_CONTAINER}
+        - TZ=${WORKSPACE_TIMEZONE}
+        - PGID=1000
+        - PUID=1000
+      volumes:
+        - /etc/localtime:/etc/localtime:ro
+        - ${APP_CODE_PATH_HOST}:/home/laradock/ICEcoder/dev
+      ports:
+        - "${IDE_ICECODER_PORT}:8080"
+      networks:
+        - backend

env-example

@@ -89,6 +89,7 @@ WORKSPACE_INSTALL_SUBVERSION=false
 WORKSPACE_INSTALL_XDEBUG=false
 WORKSPACE_INSTALL_PHPDBG=false
 WORKSPACE_INSTALL_LDAP=false
+WORKSPACE_INSTALL_GMP=false
 WORKSPACE_INSTALL_SOAP=false
 WORKSPACE_INSTALL_IMAP=false
 WORKSPACE_INSTALL_MONGO=false
@@ -149,6 +150,8 @@ PHP_FPM_INSTALL_SWOOLE=false
 PHP_FPM_INSTALL_PG_CLIENT=false
 PHP_FPM_INSTALL_PCNTL=false
 PHP_FPM_INSTALL_CALENDAR=false
+PHP_FPM_INSTALL_FAKETIME=false
+PHP_FPM_FAKETIME=-0
 
 ### PHP_WORKER ############################################
 
@@ -336,6 +339,8 @@ AEROSPIKE_INFO_PORT=3003
 # for all versions "https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz"
 # for php 7.2 (using this branch until the support for 7.2 on master) "https://github.com/aerospike/aerospike-client-php/archive/7.2.0-release-candidate.tar.gz"
 AEROSPIKE_PHP_REPOSITORY=https://github.com/aerospike/aerospike-client-php/archive/7.2.0-release-candidate.tar.gz
+# for php 5.6
+# AEROSPIKE_PHP_REPOSITORY=https://github.com/aerospike/aerospike-client-php5/archive/3.4.15.tar.gz
 
 ### RETHINKDB #############################################
 
@@ -350,7 +355,7 @@ MONGODB_PORT=27017
 CADDY_HOST_HTTP_PORT=80
 CADDY_HOST_HTTPS_PORT=443
 CADDY_HOST_LOG_PATH=./logs/caddy
-CADDY_CUSTOM_CADDYFILE=./caddy/Caddyfile
+CADDY_CONFIG_PATH=./caddy/caddy
 
 ### LARAVEL ECHO SERVER ###################################
 
@@ -406,4 +411,10 @@ MONGO_WEBUI_INSTALL_MONGO=false
 ### METABASE ###############################################
 METABASE_PORT=3030
 METABASE_DB_FILE=metabase.db
-METABASE_JAVA_TIMEZONE=US/Pacific
+METABASE_JAVA_TIMEZONE=US/Pacific
+
+### IDE ###############################################
+IDE_THEIA_PORT=987
+IDE_WEBIDE_PORT=984
+IDE_CODIAD_PORT=985
+IDE_ICECODER_PORT=986

ide-codiad/Dockerfile

@@ -0,0 +1,5 @@
+FROM linuxserver/codiad
+
+LABEL maintainer="ahkui <ahkui@outlook.com>"
+
+COPY config.php /defaults/config.php

ide-codiad/config.php

@@ -0,0 +1,43 @@
+<?php
+/*
+*  Copyright (c) Codiad & Kent Safranski (codiad.com), distributed
+*  as-is and without warranty under the MIT License. See
+*  [root]/license.txt for more. This information must remain intact.
+*/
+//////////////////////////////////////////////////////////////////
+// CONFIG
+//////////////////////////////////////////////////////////////////
+// PATH TO CODIAD
+define("BASE_PATH", "/config/www/");
+// BASE URL TO CODIAD (without trailing slash)
+define("BASE_URL", "localhost");
+// THEME : default, modern or clear (look at /themes)
+define("THEME", "default");
+// ABSOLUTE PATH, this is used as whitelist for absolute path projects
+define("WHITEPATHS", BASE_PATH . ",/home,/");
+// SESSIONS (e.g. 7200)
+$cookie_lifetime = "0";
+// TIMEZONE
+date_default_timezone_set(getenv('TZ','UTC'));
+// Allows to overwrite the default language
+//define("LANGUAGE", "en");
+// External Authentification
+//define("AUTH_PATH", "/path/to/customauth.php");
+//////////////////////////////////////////////////////////////////
+// ** DO NOT EDIT CONFIG BELOW **
+//////////////////////////////////////////////////////////////////
+// PATHS
+define("COMPONENTS", BASE_PATH . "/components");
+define("PLUGINS", BASE_PATH . "/plugins");
+define("THEMES", BASE_PATH . "/themes");
+define("DATA", BASE_PATH . "/data");
+define("WORKSPACE", getenv('APP_CODE_PATH_CONTAINER',BASE_PATH . "workspace"));
+// URLS
+define("WSURL", getenv('APP_CODE_PATH_CONTAINER',BASE_PATH . "workspace"));
+// Marketplace
+define("MARKETURL", "http://market.codiad.com/json");
+// Update Check
+//define("UPDATEURL", "http://update.codiad.com/?v={VER}&o={OS}&p={PHP}&w={WEB}&a={ACT}");
+define("ARCHIVEURL", "https://github.com/Codiad/Codiad/archive/master.zip");
+define("COMMITURL", "https://api.github.com/repos/Codiad/Codiad/commits");
+?>

ide-icecoder/Dockerfile

@@ -0,0 +1,21 @@
+FROM php:alpine
+
+LABEL maintainer="ahkui <ahkui@outlook.com>"
+
+ARG PUID=1000
+ENV PUID ${PUID}
+ARG PGID=1000
+ENV PGID ${PGID}
+
+RUN apk add --no-cache git
+
+RUN addgroup -g $PGID -S laradock && \
+    adduser -u $PUID -S laradock -G laradock
+
+USER laradock
+
+RUN cd /home/laradock && git clone https://github.com/mattpass/ICEcoder.git
+
+WORKDIR /home/laradock/ICEcoder
+
+CMD ["php","-S","0.0.0.0:8080"]

ide-theia/Dockerfile

@@ -0,0 +1,5 @@
+FROM theiaide/theia
+
+LABEL maintainer="ahkui <ahkui@outlook.com>"
+
+RUN echo 'fs.inotify.max_user_watches=524288' >> /etc/sysctl.conf

ide-webide/Dockerfile

@@ -0,0 +1,3 @@
+FROM webide/webide
+
+LABEL maintainer="ahkui <ahkui@outlook.com>"

php-fpm/Dockerfile

@@ -485,6 +485,18 @@ RUN if [ ${INSTALL_CALENDAR} = true ]; then \
     docker-php-ext-install calendar \
 ;fi
 
+###########################################################################
+# libfaketime:
+###########################################################################
+
+USER root
+
+ARG INSTALL_FAKETIME=false
+
+RUN if [ ${INSTALL_FAKETIME} = true ]; then \
+    apt-get install -y libfaketime \
+;fi
+
 ###########################################################################
 # Check PHP version:
 ###########################################################################
@@ -509,6 +521,12 @@ RUN apt-get clean && \
 
 RUN usermod -u 1000 www-data
 
+# Adding the faketime library to the preload file needs to be done last
+# otherwise it will preload it for all commands that follow in this file
+RUN if [ ${INSTALL_FAKETIME} = true ]; then \
+    echo "/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1" > /etc/ld.so.preload \
+;fi
+
 WORKDIR /var/www
 
 CMD ["php-fpm"]

travis-build.sh

@@ -15,6 +15,10 @@ if [ -n "${PHP_VERSION}" ]; then
     sed -i -- "s/PHP_VERSION=.*/PHP_VERSION=${PHP_VERSION}/g" .env
     sed -i -- 's/=false/=true/g' .env
     sed -i -- 's/PHPDBG=true/PHPDBG=false/g' .env
+    if [ "${PHP_VERSION}" == "5.6" ]; then
+        sed -i -- 's/^AEROSPIKE_PHP_REPOSITORY=/##AEROSPIKE_PHP_REPOSITORY=/g' .env
+        sed -i -- 's/^# AEROSPIKE_PHP_REPOSITORY=/AEROSPIKE_PHP_REPOSITORY=/g' .env
+    fi
     cat .env
     docker-compose build ${BUILD_SERVICE}
     docker images

workspace/Dockerfile

@@ -180,6 +180,20 @@ RUN if [ ${INSTALL_DRUSH} = true ]; then \
 
 USER root
 
+ARG INSTALL_GMP=false
+ARG PHP_VERSION=${PHP_VERSION}
+
+RUN if [ ${INSTALL_GMP} = true ]; then \
+  # Install the PHP SOAP extension
+  apt-get -y install php${PHP_VERSION}-gmp \
+;fi
+
+###########################################################################
+# SOAP:
+###########################################################################
+
+USER root
+
 ARG INSTALL_SOAP=false
 
 RUN if [ ${INSTALL_SOAP} = true ]; then \
@@ -493,12 +507,22 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
     curl -L -o /tmp/aerospike-client-php.tar.gz ${AEROSPIKE_PHP_REPOSITORY} \
     && mkdir -p aerospike-client-php \
     && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
-    && ( \
+    && \
-        cd aerospike-client-php/src \
+      if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
-        && phpize \
+        ( \
-        && ./build.sh \
+            cd aerospike-client-php/src/aerospike \
-        && make install \
+            && phpize \
-    ) \
+            && ./build.sh \
+            && make install \
+        ) \
+      else \
+        ( \
+            cd aerospike-client-php/src \
+            && phpize \
+            && ./build.sh \
+            && make install \
+        ) \
+      fi \
     && rm /tmp/aerospike-client-php.tar.gz \
     && echo 'extension=aerospike.so' >> /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \
     && echo 'aerospike.udf.lua_system_path=/usr/local/aerospike/lua' >> /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \