From b2d13a2493e8f2ff2dfbcaf141c78aa8a8c9648d Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Fri, 22 Nov 2019 18:03:54 +0100
Subject: [PATCH] :arrow_up: Update postgresql on devenv and add smtp relay
 container.

---
 docker/devenv/Dockerfile          |  6 +++---
 docker/devenv/docker-compose.yaml | 13 +++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile
index 968287408..1ab929998 100644
--- a/docker/devenv/Dockerfile
+++ b/docker/devenv/Dockerfile
@@ -43,12 +43,12 @@ RUN set -ex; \
     apt-get -qq update; \
     apt-get install -qqy zulu-12; \
     apt-get install -qqy \
-        postgresql-11 \
-        postgresql-contrib-11 \
+        postgresql-12 \
+        postgresql-contrib-12 \
     ;\
     rm -rf /var/lib/apt/lists/*;
 
-COPY files/pg_hba.conf /etc/postgresql/11/main/pg_hba.conf
+COPY files/pg_hba.conf /etc/postgresql/12/main/pg_hba.conf
 COPY files/bashrc /root/.bashrc
 COPY files/vimrc /root/.vimrc
 
diff --git a/docker/devenv/docker-compose.yaml b/docker/devenv/docker-compose.yaml
index a567ab910..c958916ff 100644
--- a/docker/devenv/docker-compose.yaml
+++ b/docker/devenv/docker-compose.yaml
@@ -17,11 +17,12 @@ services:
     build:
       context: ./
     hostname: 'uxbox-devenv'
-    container_name: 'uxbox-devenv'
+    container_name: 'uxbox-devenv-main'
     command: "/home/uxbox/init.sh"
     stop_signal: SIGINT
     depends_on:
       - postgres
+      - smtp
     volumes:
       - "user_data:/home/uxbox/local"
       - "${PWD}:/home/uxbox/uxbox"
@@ -31,13 +32,21 @@ services:
     ports:
       - 3449:3449
       - 6060:6060
+      - 9090:9090
 
     environment:
-      - UXBOX_HTTP_SERVER_DEBUG=false
       - UXBOX_DATABASE_URI="postgresql://postgres/uxbox"
       - UXBOX_DATABASE_USERNAME="uxbox"
       - UXBOX_DATABASE_PASSWORD="uxbox"
 
+  smtp:
+    container_name: 'uxbox-devenv-smtp'
+    image: mwader/postfix-relay
+    restart: always
+    environment:
+      - POSTFIX_myhostname=smtp.uxbox.io
+      - OPENDKIM_DOMAINS=smtp.uxbox.io
+
   postgres:
     image: postgres:12
     hostname: 'uxbox-devenv-postgres'