From e06e09387c066cc2aacbda8055eb32bcd41dea77 Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Mon, 5 Dec 2016 12:22:00 +0000 Subject: [PATCH] dbq --- src/Docker/php/Dockerfile | 4 ++-- www/dbq/docker-compose.yaml | 1 + www/dbq/html/index.php | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Docker/php/Dockerfile b/src/Docker/php/Dockerfile index d011c27f..c50d04f6 100644 --- a/src/Docker/php/Dockerfile +++ b/src/Docker/php/Dockerfile @@ -4,8 +4,8 @@ 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 sqlite perl perl-uri -RUN docker-php-ext-install pdo pdo_mysql pdo_sqlite pdo_sqlite pdo_pgsql pgsql +RUN set -ex && apk --no-cache add postgresql-dev sqlite 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 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 EXPOSE 9000 diff --git a/www/dbq/docker-compose.yaml b/www/dbq/docker-compose.yaml index ec934e5f..d4b1e499 100644 --- a/www/dbq/docker-compose.yaml +++ b/www/dbq/docker-compose.yaml @@ -10,6 +10,7 @@ services: volumes: - ./../..:$NB_ROOT - /etc/profile.d + - $HOME/.dbq:/home/www-data/.dbq entrypoint: sh -c "echo . $NB_ROOT/etc/profile > /etc/profile.d/nb.sh && /usr/local/sbin/php-fpm" #entrypoint: "/usr/local/sbin/php-fpm" diff --git a/www/dbq/html/index.php b/www/dbq/html/index.php index aa108f0d..b16fecf8 100644 --- a/www/dbq/html/index.php +++ b/www/dbq/html/index.php @@ -40,7 +40,9 @@ function run() { #$this->out->rows($format,$rows,$head); $Db->out([ [ 'help', 'This help' ], - [ 'ls', 'List databases' ], + [ 'ls', 'List configured databases' ], + [ 'status', 'Database status' ], + [ 'databases', 'List others databases' ], ],['command','description']); return $Page->end(); @@ -92,6 +94,7 @@ function run() { $Db->out([ [ 'help', 'This help' ], [ 'ls', 'List records' ], + [ 'fields', 'List fields' ], ],['command','description']); return $Page->end(); @@ -121,6 +124,7 @@ function parse_uri($params=[]) { $count = count($values); foreach ($params as $p => $default) { if ($i>=$count) break; + if (!preg_match('/^[\w\._-]{2,100}$/',$values[$i])) not_implemented(); $params[$p] = $values[$i]; $i++; } -- 2.47.3