From: Nicolas Boisselier Date: Fri, 13 Jan 2017 00:07:41 +0000 (+0000) Subject: Bed X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=4aa5c688805e70554f40b7175a6f97ccdc14cc91;p=nb.git Bed --- diff --git a/etc/profile b/etc/profile index 0fac7cb1..7b96fff8 100755 --- a/etc/profile +++ b/etc/profile @@ -97,7 +97,7 @@ else if [ -n "$NB_ROOT" ]; then #[ -e "$NB_ROOT/etc/profile.d/envs" ] && . "$NB_ROOT/etc/profile.d/envs" - alias which=which_cache + #alias which=which_cache for i in \ ${NB_ROOT}/etc/profile.d/envs \ ${NB_ROOT}/etc/profile.d/aliases \ @@ -106,7 +106,7 @@ else [ -n "$NB_DEBUG" ] && $NB_DEBUG ". $i" [ -r "$i" -a -f "$i" ] && . "$i" done - unalias which + #unalias which fi diff --git a/etc/profile.d/functions b/etc/profile.d/functions index a9dc8227..589add99 100644 --- a/etc/profile.d/functions +++ b/etc/profile.d/functions @@ -844,6 +844,5 @@ which_cache() { } uncomment() { - grep -E '^\s*\w' $@ - #grep -Ev '^\s*(["\'/\#\;-])' + grep -Ev '^\s*(["/\#\;-]|$)' $@ | grep -Ev "^\s*'" | cat } diff --git a/src/Docker/php/Dockerfile b/src/Docker/php/Dockerfile index 27172f5c..e420498c 100644 --- a/src/Docker/php/Dockerfile +++ b/src/Docker/php/Dockerfile @@ -1,14 +1,17 @@ FROM php:7.0-fpm-alpine RUN mkdir /opt -# Install Postgre PDO -#RUN export DEBIAN_FRONTEND=noninteractive && apt-get -q=2 update && apt-get -q=2 -y install libpq-dev -#RUN docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql +# Install php extentions RUN set -ex && apk --no-cache add postgresql-dev sqlite bash perl perl-uri libmcrypt-dev RUN docker-php-ext-install -j$(grep ^proc /proc/cpuinfo |wc -l) mcrypt pdo pdo_mysql pdo_sqlite pdo_sqlite pdo_pgsql pgsql mcrypt + +# Home page RUN mkdir -p /var/www/html && echo 'Welcom to php:7.0-fpm-alpine

Welcom to php:7.0-fpm-alpine

' > /var/www/html/index.php +# Conf +COPY ./php-fpm.d/* /usr/local/etc/php-fpm.d/ +RUN rm -f /usr/local/etc/php-fpm.d/www.conf.default + EXPOSE 9000 #CMD ["/usr/local/bin/php", "-a"] -#ENTRYPOINT printf "[www]\n\nuser = $USER\n" > /usr/local/etc/php-fpm.d/www.conf.default && /usr/local/sbin/php-fpm ENTRYPOINT /usr/local/sbin/php-fpm diff --git a/src/Docker/php/php-fpm.d/socket.conf b/src/Docker/php/php-fpm.d/socket.conf new file mode 100644 index 00000000..dfc906c4 --- /dev/null +++ b/src/Docker/php/php-fpm.d/socket.conf @@ -0,0 +1,12 @@ +[socket] +user = www-data +group = www-data +listen = /var/run/php5-fpm.sock +listen.owner = www-data +listen.group = www-data +pm = dynamic +pm.max_children = 5 +pm.start_servers = 2 +pm.min_spare_servers = 1 +pm.max_spare_servers = 3 +chdir = / diff --git a/src/Docker/php/php-fpm.d/www.conf b/src/Docker/php/php-fpm.d/www.conf new file mode 100644 index 00000000..a95b72fd --- /dev/null +++ b/src/Docker/php/php-fpm.d/www.conf @@ -0,0 +1,9 @@ +[www] +user = www-data +group = www-data +listen = 127.0.0.1:9000 +pm = dynamic +pm.max_children = 5 +pm.start_servers = 2 +pm.min_spare_servers = 1 +pm.max_spare_servers = 3 diff --git a/www/dbq/docker-compose.yaml b/www/dbq/docker-compose.yaml index e357eabb..6f0ee8a1 100644 --- a/www/dbq/docker-compose.yaml +++ b/www/dbq/docker-compose.yaml @@ -12,6 +12,7 @@ services: hostname: dbq volumes: - ./../..:$NB_ROOT + - /var/run - /etc/profile.d - $HOME/.dbq:/etc/dbq - $HOME/ownCloud/var/lib/sqlite:/var/lib/sqlite @@ -28,7 +29,10 @@ services: args: - WWW_ROOT=$NB_ROOT/www/dbq/html - FASTCGI_PASS=php:9000 + #- FASTCGI_PASS=unix:/var/run/php5-fpm.sock #- CONF=$NB_ROOT/www/dbq/etc/nginx/default.conf + #volumes: + #- ./etc/nginx:/etc/nginx/conf.d/ volumes_from: - php links: diff --git a/www/dbq/html/default.min.css b/www/dbq/html/default.min.css index 31acc87d..45c8c7c8 100644 --- a/www/dbq/html/default.min.css +++ b/www/dbq/html/default.min.css @@ -1 +1 @@ -html{font:90% 'Trebuchet MS',sans-serif;background-color:#eee}body{display:table;margin-left:auto;margin-right:auto;padding-left:1em;padding-right:1em;color:#444}h1{margin:0 0 0.2em 0}a{color:inherit}a,a:visited{text-decoration:none}ul{padding:0;margin:0}li{list-style:none;padding:0 0 0 0.3em}table{border-collapse:collapse}td,th{padding:0.2em 0.7em}th a.sort{padding:0 0.3em}textarea,select,input:not([type]),input[type='text'],input[type='password'],input[type='date'],input[type='email'],input[type='url'],input[type='']{border-radius:3px;border:solid 1px #ddd;padding:0.3em 0.4em}input[size]{max-width:70%}div.row div label:after,form label:after{content:':'}form label,form input,form select{vertical-align:middle;margin:0.2em 0.4em 0.2em 0}table.rows,div.row,ul.row,form.edit,.menu,.block,object,iframe,pre{border-radius:4px;border-collapse:separate;border-spacing:0;padding:0.5em 0.2em;margin-bottom:0.5em;border:solid 1px #ccc}.rows{padding:0}ul.row li,div.row div,table.rows th,table.rows td{border-bottom:solid 1px #ccc}ul.row li,div.row div,table.rows tr:last-child td{border-bottom:none}div.row div{margin:0}ul.row li label,div.row div label{padding:0.1em 0.5em 0.1em 0;min-width:20%;display:inline-block}.menu,.nav,.rows,.buttons,.center{margin-left:auto;margin-right:auto;display:table}.button{font:inherit;display:inline-block;text-decoration:none;line-height:1.5em;cursor:pointer;border-radius:4px;white-space:nowrap;box-sizing:border-box;margin:0;padding:0 0.2em;color:#eee;border:solid 1px #000;background-color:#444}a:hover,.button:hover{opacity:0.8}form.menu{padding:0.5em;background-color:#F9F9F9}form.menu .button.add{float:right;margin-top:0.1em}form.menu .criterias{border-top:dashed 1px #ccc;margin-top:0.3em;padding-top:0.3em}form.menu .criterias span.label{border-right:solid 1px #fff;padding:0.2em 0.1em;margin:0.2em 0.2em 0 0;border-radius:3px}form.menu .criterias span.label:last-child{border-right:none}form.menu select:focus{max-width:auto}form.menu select{max-width:20%}form.menu .criterias input[type=text]:focus{width:auto}form.menu .criterias input[type=text]{width:4em}form.edit .fields label{width:25%;text-align:right;display:inline-block;margin-right:1em;vertical-align:top}form.edit .fields .label span{width:54%;display:inline-block;text-align:left}form.edit .fields input,form.edit .fields textarea,form.edit .fields select{width:65%}form.edit .fields label{width:25%;text-align:right;display:inline-block;margin-right:1em;vertical-align:top}form.edit .fields .label span{width:54%;display:inline-block;text-align:left} \ No newline at end of file +html{font:90% 'Trebuchet MS',sans-serif;background-color:#F5F5F5}body{display:table;margin-left:auto;margin-right:auto;padding-left:1em;padding-right:1em;color:#444}h1{margin:0 0 0.2em 0}a{color:inherit}p a,div > a,li a,td a{color:#E59B24}a,a:visited{text-decoration:none}ul{padding:0;margin:0}li{list-style:none;padding:0 0 0 0.3em}table{border-collapse:collapse}td,th{padding:0.2em 0.7em}th a.sort{padding:0 0.3em}textarea,select,input:not([type]),input[type='text'],input[type='password'],input[type='date'],input[type='email'],input[type='url'],input[type='']{border-radius:3px;border:solid 1px #ddd;padding:0.3em 0.4em}input[size]{max-width:70%}div.row div label:after,form label:after{content:':'}form label,form input,form select{vertical-align:middle;margin:0.2em 0.4em 0.2em 0}table.rows,div.row,ul.row,form.edit,.menu,.block,object,iframe,pre{border-radius:4px;border-collapse:separate;border-spacing:0;padding:0.5em 0.2em;margin-bottom:0.5em;border:solid 1px #E5E5E5;background-color:#FAFAFA}.rows{padding:0}ul.row li,div.row div,table.rows th,table.rows td{border-bottom:solid 1px #E5E5E5}ul.row li,div.row div,table.rows tr:last-child td{border-bottom:none}table.rows td{padding:0.3em 0.1em}table.rows th{padding-top:0}table.rows tr:last-child td{padding-bottom:0}div.row div{margin:0}ul.row li label,div.row div label{padding:0.1em 0.5em 0.1em 0;min-width:20%;display:inline-block}.menu,.nav,.rows,.buttons,.center{margin-left:auto;margin-right:auto;display:table}.button{font:inherit;display:inline-block;text-decoration:none;line-height:1.5em;cursor:pointer;border-radius:4px;white-space:nowrap;box-sizing:border-box;margin:0;padding:0 0.1em;cursor:pointer;color:#F5F5F5;background-color:#666;padding:0.1em 0.3em;border:none}a:hover,.button:hover{opacity:0.8}form.menu{padding:0.5em;background-color:#FAFAFA}form.menu .button.add{float:right;margin-top:0.1em}form.menu .criterias{border-top:dashed 1px #E5E5E5;margin-top:0.3em;padding-top:0.3em}form.menu .criterias span.label{border-right:solid 1px #fff;padding:0.2em 0.1em;margin:0.2em 0.2em 0 0;border-radius:3px}form.menu .criterias span.label:last-child{border-right:none}form.menu select:focus{max-width:auto}form.menu select{max-width:20%}form.menu .criterias input[type=text]:focus{width:auto}form.menu .criterias input[type=text]{width:4em}form.edit .fields label{width:25%;text-align:right;display:inline-block;margin-right:1em;vertical-align:top}form.edit .fields .label span{width:54%;display:inline-block;text-align:left}form.edit .fields input,form.edit .fields textarea,form.edit .fields select{width:65%}form.edit .fields label{width:25%;text-align:right;display:inline-block;margin-right:1em;vertical-align:top}form.edit .fields .label span{width:54%;display:inline-block;text-align:left} \ No newline at end of file