Skip to content

Commit

Permalink
Merge pull request #114 from mboersma/update-go-compiler
Browse files Browse the repository at this point in the history
chore(Makefile): update to go-dev 0.17.0
  • Loading branch information
mboersma authored Aug 19, 2016
2 parents ba66283 + a686c8a commit 9653c7d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ sudo: required
install:
- make bootstrap
script:
- make test build docker-build
- DEIS_REGISTRY='' make test build docker-build
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
SHORT_NAME := minio

export GO15VENDOREXPERIMENT=1

# dockerized development environment variables
REPO_PATH := github.com/deis/${SHORT_NAME}
DEV_ENV_IMAGE := quay.io/deis/go-dev:0.9.1
DEV_ENV_IMAGE := quay.io/deis/go-dev:0.17.0
DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
Expand Down Expand Up @@ -36,12 +34,10 @@ test:
${DEV_ENV_CMD} go test ${TEST_PACKAGES}

docker-build: build

# build the main image
docker build --rm -t ${IMAGE} rootfs
docker tag ${IMAGE} ${MUTABLE_IMAGE}


deploy: build docker-build docker-push

.PHONY: all bootstrap glideup build test docker-build deploy
2 changes: 1 addition & 1 deletion rootfs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/deis/base:0.2.0
FROM quay.io/deis/base:0.3.1

RUN adduser --system \
--shell /bin/bash \
Expand Down

0 comments on commit 9653c7d

Please sign in to comment.