From: Nicolas Boisselier Date: Mon, 21 Nov 2016 11:22:23 +0000 (+0000) Subject: docker X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=3a0acf8ae3b91a376fe2c6a441c0ad559069a249;p=nb.git docker --- diff --git a/etc/dbq/zzz-all.php b/etc/dbq/zzz-all.php index 6ed014da..a8491772 100644 --- a/etc/dbq/zzz-all.php +++ b/etc/dbq/zzz-all.php @@ -42,15 +42,15 @@ $DBQ['all'] = [ 'host' => ':memory:', 'type' => 'sqlite', 'pdo' => '', - '_import' => 'nb', + '_import' => [], #'order' => '0', 'options' => [ PDO::ATTR_PERSISTENT => true, ], 'tables' => [], 'sql_pre' => [ - 'PRAGMA busy_timeout = 1000', #'PRAGMA synchronous=NORMAL', + 'PRAGMA busy_timeout = 1000', 'PRAGMA journal_mode=MEMORY', ], ]; diff --git a/src/Docker/Compose/dbq/css b/src/Docker/Compose/dbq/css new file mode 120000 index 00000000..d1844d60 --- /dev/null +++ b/src/Docker/Compose/dbq/css @@ -0,0 +1 @@ +/opt/nb/lib/css \ No newline at end of file diff --git a/src/Docker/Compose/dbq/jquery b/src/Docker/Compose/dbq/jquery new file mode 120000 index 00000000..a889476e --- /dev/null +++ b/src/Docker/Compose/dbq/jquery @@ -0,0 +1 @@ +/opt/nb/lib/jquery \ No newline at end of file diff --git a/src/Docker/Compose/dbq/js b/src/Docker/Compose/dbq/js new file mode 120000 index 00000000..87fc642b --- /dev/null +++ b/src/Docker/Compose/dbq/js @@ -0,0 +1 @@ +/opt/nb/lib/js \ No newline at end of file diff --git a/src/Docker/php/Dockerfile b/src/Docker/php/Dockerfile index 0898951c..4c35d058 100644 --- a/src/Docker/php/Dockerfile +++ b/src/Docker/php/Dockerfile @@ -4,7 +4,7 @@ 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 -RUN set -ex && apk --no-cache add postgresql-dev +RUN set -ex && apk --no-cache add postgresql-dev sqlite perl perl-uri perl-encode RUN docker-php-ext-install pdo pdo_mysql pdo_sqlite pdo_sqlite pdo_pgsql pgsql 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