Skip to content

Commit

Permalink
Update dockerfile for go 1.14 and compose config
Browse files Browse the repository at this point in the history
  • Loading branch information
tobischo committed Jun 15, 2020
1 parent d49b700 commit c0c9a53
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
17 changes: 11 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 1 addition & 1 deletion e2etests/config_docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit c0c9a53

Please sign in to comment.