feat: dev environment also starts postgresql

This commit is contained in:
Revant Nandgaonkar 2020-06-30 15:25:10 +05:30
parent 8a93944de7
commit f871834dbe
2 changed files with 12 additions and 2 deletions

View File

@ -9,6 +9,14 @@ services:
- ../installation/frappe-mariadb.cnf:/etc/mysql/conf.d/frappe.cnf - ../installation/frappe-mariadb.cnf:/etc/mysql/conf.d/frappe.cnf
- mariadb-vol:/var/lib/mysql - mariadb-vol:/var/lib/mysql
postgresql:
image: postgres:11.8
restart: on-failure
environment:
- POSTGRES_PASSWORD=123
volumes:
- postgresql-vol:/var/lib/postgresql/data
redis-cache: redis-cache:
image: redis:alpine image: redis:alpine
@ -30,3 +38,4 @@ services:
volumes: volumes:
mariadb-vol: mariadb-vol:
postgresql-vol:

View File

@ -6,6 +6,7 @@ RUN install_packages \
git \ git \
wkhtmltopdf \ wkhtmltopdf \
mariadb-client \ mariadb-client \
postgresql-client \
gettext-base \ gettext-base \
wget \ wget \
# for PDF # for PDF
@ -84,8 +85,8 @@ RUN bash -c "bench --version"
# https://nodejs.org/download/release/latest-v10.x/ # https://nodejs.org/download/release/latest-v10.x/
# https://nodejs.org/download/release/latest-v12.x/ # https://nodejs.org/download/release/latest-v12.x/
# https://nodejs.org/download/release/latest-v13.x/ # https://nodejs.org/download/release/latest-v13.x/
ENV NODE_VERSION=12.16.3 ENV NODE_VERSION=12
ENV NODE_VERSION_FRAPPEV11=10.20.1 ENV NODE_VERSION_FRAPPEV11=10
# Install nvm with node # Install nvm with node
RUN wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh RUN wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh