From: Nicolas Boisselier Date: Sat, 19 Nov 2016 16:32:36 +0000 (+0000) Subject: docker.sh, php.sh X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=cbf55c867a8b3ede0ae23f801dd7d0a8555b448f;p=nb.git docker.sh, php.sh --- diff --git a/etc/profile.d/php.sh b/etc/profile.d/php.sh index da80ba79..ffe29653 100644 --- a/etc/profile.d/php.sh +++ b/etc/profile.d/php.sh @@ -9,3 +9,8 @@ php425() { which php > /dev/null || return 0 function php_check() { php --define error_reporting=22519 --define display_errors=1 --define log_errors=1 --define html_errors=0 $@; } + +function php_run() { + local code="$1"; shift + php -f $NB_ROOT/lib/php/db.php -r "require '$NB_ROOT/lib/php/page.php';$code;" $@ +} diff --git a/src/Docker/nginx/Dockerfile b/src/Docker/nginx/Dockerfile index d5d804b5..4e39274a 100644 --- a/src/Docker/nginx/Dockerfile +++ b/src/Docker/nginx/Dockerfile @@ -1,3 +1,4 @@ FROM nginx:latest COPY ./default.conf /etc/nginx/conf.d/default.conf +RUN mkdir -p /var/www/html && echo 'Hi

Hi

' > /var/www/html/index.html CMD nginx -g 'daemon off;'