From c0c9a53f3d477a86b1fcb4f7131fd1ee0d70d978 Mon Sep 17 00:00:00 2001
From: Tobias Schoknecht <tobias.schoknecht@barzahlen.de>
Date: Mon, 15 Jun 2020 15:06:46 +0200
Subject: [PATCH] Update dockerfile for go 1.14 and compose config

---
 Dockerfile                |  2 +-
 docker-compose.yml        | 17 +++++++++++------
 e2etests/config_docker.go |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 590a072..84c8252 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.11.2
+FROM golang:1.14.4
 
 # Don't run tests as root so we can play with permissions
 RUN useradd --create-home --user-group app
diff --git a/docker-compose.yml b/docker-compose.yml
index 19fc12a..15bb904 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,12 @@
-gotidus:
-  image: gotidus
-  links:
-    - 'gotiduspgdb:pgdb'
+version: '3.8'
 
-gotiduspgdb:
-  image: postgres
+services:
+  gotidus:
+    build: ./
+    depends_on:
+      - 'gotiduspgdb'
+
+  gotiduspgdb:
+    image: postgres
+    environment:
+      POSTGRES_PASSWORD: 'ci'
diff --git a/e2etests/config_docker.go b/e2etests/config_docker.go
index 74b4100..c50b29d 100644
--- a/e2etests/config_docker.go
+++ b/e2etests/config_docker.go
@@ -2,4 +2,4 @@
 
 package e2etests
 
-var PGURI = "postgres://postgres@pgdb:5432/postgres?sslmode=disable"
+var PGURI = "postgres://postgres:ci@gotiduspgdb:5432/postgres?sslmode=disable"