moving to docker-compose
parent
54fb3b260a
commit
a4e2cb918b
|
@ -0,0 +1,77 @@
|
||||||
|
# nginxy
|
||||||
|
# - publiczny
|
||||||
|
nginxpublic:
|
||||||
|
build: images/nginx
|
||||||
|
volumes:
|
||||||
|
- "/opt/hangar18/configs/nginx-public/:/etc/nginx/sites-enabled:ro"
|
||||||
|
- "/opt/hangar18/logs/nginx-public/:/var/log/nginx/"
|
||||||
|
- "/opt/hangar18/run/php-fpm/:/var/run/php-fpm/"
|
||||||
|
- "/opt/hangar18/data/php-fpm/:/opt/php/"
|
||||||
|
links:
|
||||||
|
- etherpad
|
||||||
|
ports:
|
||||||
|
- "80:80"
|
||||||
|
- "443:443"
|
||||||
|
|
||||||
|
|
||||||
|
# - wewnętrzny
|
||||||
|
nginxinternal:
|
||||||
|
build: images/nginx
|
||||||
|
volumes:
|
||||||
|
- "/opt/hangar18/configs/nginx-internal/:/etc/nginx/sites-enabled:ro"
|
||||||
|
- "/opt/hangar18/logs/nginx-internal/:/var/log/nginx/"
|
||||||
|
- "/opt/hangar18/run/php-fpm/:/var/run/php-fpm/"
|
||||||
|
- "/opt/hangar18/data/php-fpm/:/opt/php/"
|
||||||
|
volumes_from:
|
||||||
|
- pgadmin
|
||||||
|
- rest
|
||||||
|
|
||||||
|
|
||||||
|
etherpad:
|
||||||
|
build: images/etherpad
|
||||||
|
links:
|
||||||
|
- postgres
|
||||||
|
volumes:
|
||||||
|
- "/opt/hangar18/logs/etherpad:var/log/etherpad"
|
||||||
|
|
||||||
|
|
||||||
|
# php-fpm front-endowy
|
||||||
|
# musi mieć dostęp do nginx.private, by robić restowe zapytania
|
||||||
|
# - frontend
|
||||||
|
frontend:
|
||||||
|
build: images/php-fpm
|
||||||
|
volumes:
|
||||||
|
- "/opt/hangar18/data/php-fpm/frontend/:/opt/php/frontend/"
|
||||||
|
- "/opt/hangar18/logs/php-fpm/:/var/log/php-fpm"
|
||||||
|
- "/opt/hangar18/run/php-fpm/:/var/run/php-fpm"
|
||||||
|
links:
|
||||||
|
- "nginxinternal:rest"
|
||||||
|
environment:
|
||||||
|
APP_NAME: "frontend"
|
||||||
|
|
||||||
|
rest:
|
||||||
|
build: images/rest
|
||||||
|
volumes:
|
||||||
|
- "/opt/hangar18/logs/php-fpm/:/var/log/php-fpm"
|
||||||
|
- "/opt/hangar18/run/php-fpm/:/var/run/php-fpm"
|
||||||
|
links:
|
||||||
|
- postgres
|
||||||
|
environment:
|
||||||
|
APP_NAME: "rest"
|
||||||
|
|
||||||
|
|
||||||
|
pgadmin:
|
||||||
|
build: images/pgadmin
|
||||||
|
volumes:
|
||||||
|
- "/opt/hangar18/configs/pgadmin/:/opt/pgadmin/conf/:ro"
|
||||||
|
- "/opt/hangar18/logs/php-fpm/:/var/log/php-fpm"
|
||||||
|
- "/opt/hangar18/run/php-fpm/:/var/run/php-fpm"
|
||||||
|
links:
|
||||||
|
- postgres
|
||||||
|
|
||||||
|
|
||||||
|
postgres:
|
||||||
|
build: images/postgres
|
||||||
|
volumes:
|
||||||
|
- "/opt/hangar18/data/postgres:/var/lib/postgresql"
|
||||||
|
- "/opt/hangar18/logs/postgres:/var/log/postgresql"
|
|
@ -1,4 +1,4 @@
|
||||||
FROM plug/php-fpm
|
FROM hangar18_frontend
|
||||||
MAINTAINER Michał "rysiek" Woźniak <rysiek@hackerspace.pl>
|
MAINTAINER Michał "rysiek" Woźniak <rysiek@hackerspace.pl>
|
||||||
|
|
||||||
ENV APP_NAME "pgadmin"
|
ENV APP_NAME "pgadmin"
|
||||||
|
|
|
@ -4,8 +4,10 @@ MAINTAINER Michał "rysiek" Woźniak <rysiek@hackerspace.pl>
|
||||||
# based on https://github.com/leoditommaso/docker_php-fpm/blob/master/Dockerfile
|
# based on https://github.com/leoditommaso/docker_php-fpm/blob/master/Dockerfile
|
||||||
# by Leandro Di Tommaso <leandro.ditommaso@mikroways.net>
|
# by Leandro Di Tommaso <leandro.ditommaso@mikroways.net>
|
||||||
|
|
||||||
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
|
|
||||||
# Packages to install on the container.
|
# Packages to install on the container.
|
||||||
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get upgrade && apt-get install -y \
|
RUN apt-get update && apt-get -y upgrade && apt-get install -y \
|
||||||
php5-cgi php5-cli php5-fpm php5-curl php5-gd php5-imagick php5-imap \
|
php5-cgi php5-cli php5-fpm php5-curl php5-gd php5-imagick php5-imap \
|
||||||
php5-json php5-ldap php5-mcrypt php5-pgsql php5-odbc php5-sasl \
|
php5-json php5-ldap php5-mcrypt php5-pgsql php5-odbc php5-sasl \
|
||||||
php5-xcache php5-xmlrpc php5-xsl
|
php5-xcache php5-xmlrpc php5-xsl
|
||||||
|
|
|
@ -16,7 +16,7 @@ RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/
|
||||||
# Install ``python-software-properties``, ``software-properties-common`` and PostgreSQL 9.3
|
# Install ``python-software-properties``, ``software-properties-common`` and PostgreSQL 9.3
|
||||||
# There are some warnings (in red) that show up during the build. You can hide
|
# There are some warnings (in red) that show up during the build. You can hide
|
||||||
# them by prefixing each apt-get statement with DEBIAN_FRONTEND=noninteractive
|
# them by prefixing each apt-get statement with DEBIAN_FRONTEND=noninteractive
|
||||||
RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get upgrade && apt-get install -y python-software-properties software-properties-common postgresql-9.3 postgresql-client-9.3 postgresql-contrib-9.3
|
RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get -y upgrade && apt-get install -y python-software-properties software-properties-common postgresql-9.3 postgresql-client-9.3 postgresql-contrib-9.3
|
||||||
|
|
||||||
# clear the data dir
|
# clear the data dir
|
||||||
RUN rm -rf /var/lib/postgresql/9.3/
|
RUN rm -rf /var/lib/postgresql/9.3/
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM plug/php-fpm
|
FROM hangar18_frontend
|
||||||
MAINTAINER Michał "rysiek" Woźniak <rysiek@hackerspace.pl>
|
MAINTAINER Michał "rysiek" Woźniak <rysiek@hackerspace.pl>
|
||||||
|
|
||||||
ENV APP_NAME "rest"
|
ENV APP_NAME "rest"
|
||||||
|
|
Loading…
Reference in New Issue