From f871834dbe229e464a6d9533692b45ffc47405a2 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Tue, 30 Jun 2020 15:25:10 +0530 Subject: [PATCH] feat: dev environment also starts postgresql --- .devcontainer/docker-compose.yml | 9 +++++++++ build/bench/Dockerfile | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index b0a1e6d6..104c5442 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,6 +9,14 @@ services: - ../installation/frappe-mariadb.cnf:/etc/mysql/conf.d/frappe.cnf - 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: image: redis:alpine @@ -30,3 +38,4 @@ services: volumes: mariadb-vol: + postgresql-vol: diff --git a/build/bench/Dockerfile b/build/bench/Dockerfile index 7a215911..e237ae3c 100644 --- a/build/bench/Dockerfile +++ b/build/bench/Dockerfile @@ -6,6 +6,7 @@ RUN install_packages \ git \ wkhtmltopdf \ mariadb-client \ + postgresql-client \ gettext-base \ wget \ # 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-v12.x/ # https://nodejs.org/download/release/latest-v13.x/ -ENV NODE_VERSION=12.16.3 -ENV NODE_VERSION_FRAPPEV11=10.20.1 +ENV NODE_VERSION=12 +ENV NODE_VERSION_FRAPPEV11=10 # Install nvm with node RUN wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh