From: Nicolas Boisselier Date: Sun, 20 Nov 2016 05:30:20 +0000 (+0000) Subject: Bed X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=01a514733a077328326143579312212df9487355;p=nb.git Bed --- diff --git a/etc/profile.d/docker.sh b/etc/profile.d/docker.sh index edc10081..266e5015 100644 --- a/etc/profile.d/docker.sh +++ b/etc/profile.d/docker.sh @@ -19,7 +19,9 @@ if [ -z "$MYVIMRC" ]; then fi if which docker-compose > /dev/null; then - true +docker_compose_force() { + docker-compose up --force-recreate --build --remove-orphans -d $@ +} fi docker_build() { diff --git a/src/Docker/Compose/dbq/docker-compose.yaml b/src/Docker/Compose/dbq/docker-compose.yaml index 07f9798b..3ee14545 100644 --- a/src/Docker/Compose/dbq/docker-compose.yaml +++ b/src/Docker/Compose/dbq/docker-compose.yaml @@ -3,13 +3,18 @@ php: volumes: #- ./../../../..:/opt/nb - ./../../../../..:/opt - - ./../../../../lib/php/db:/var/www/html + - ./:/var/www/html + #- ./../../../../lib/php/db:/var/www/html + command: + - "/bin/echo HELLO > /HELLO" expose: - 9000 nginx: build: ../../nginx/ #image: nginx:latest + volumes_from: + - php ports: - 80:80 links: diff --git a/src/Docker/Compose/dbq/index.php b/src/Docker/Compose/dbq/index.php new file mode 100644 index 00000000..c1bf87f6 --- /dev/null +++ b/src/Docker/Compose/dbq/index.php @@ -0,0 +1,24 @@ + + + + + + + [% var.filename %] - [% user.me_now %] + + + + + + + + + + + + +

APP

+ + + + diff --git a/src/Docker/nginx/Dockerfile b/src/Docker/nginx/Dockerfile index 4e39274a..ccdd0dac 100644 --- a/src/Docker/nginx/Dockerfile +++ b/src/Docker/nginx/Dockerfile @@ -1,4 +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 +RUN mkdir -p /var/www/html && echo 'Welcom to Nginx

Welcom to Nginx

' > /var/www/html/index.html CMD nginx -g 'daemon off;' diff --git a/src/Docker/php/Dockerfile b/src/Docker/php/Dockerfile index a3f65d0b..0898951c 100644 --- a/src/Docker/php/Dockerfile +++ b/src/Docker/php/Dockerfile @@ -1,12 +1,13 @@ 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 RUN set -ex && apk --no-cache add postgresql-dev RUN docker-php-ext-install pdo pdo_mysql pdo_sqlite pdo_sqlite pdo_pgsql pgsql -RUN mkdir /opt +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 #CMD ["/usr/local/bin/php", "-a"] -CMD /usr/local/sbin/php-fpm +ENTRYPOINT /usr/local/sbin/php-fpm