Merge pull request #163 from mboersma/update-base-image

chore(Makefile,Dockerfile): update base and go-dev to latest
deis · Nov 4, 2016 · 8448c7c · 8448c7c
2 parents 43fef3c + 8c85530
commit 8448c7c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/deis/base:v0.3.4
+FROM quay.io/deis/base:v0.3.5
 
 ENV LANG=en_US.utf8 \
     PG_MAJOR=9.4 \

diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ SHELL_SCRIPTS = $(wildcard _scripts/*.sh) rootfs/bin/backup rootfs/bin/is_runnin
 
 # The following variables describe the containerized development environment
 # and other build options
-DEV_ENV_IMAGE := quay.io/deis/go-dev:0.19.0
+DEV_ENV_IMAGE := quay.io/deis/go-dev:0.20.0
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_CMD := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
 DEV_ENV_CMD_INT := docker run -it --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}