Skip to content

Commit 44c11c4

Browse files
committed
Update alpine and golang images
1 parent 9ceb61f commit 44c11c4

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ ALL_ARCH := amd64
4343

4444
# Set default base image dynamically for each arch
4545
ifeq ($(ARCH),amd64)
46-
BASEIMAGE?=alpine:3.4
46+
BASEIMAGE?=alpine:3.7
4747
endif
4848
ifeq ($(ARCH),arm)
4949
BASEIMAGE?=armel/busybox
@@ -58,7 +58,7 @@ endif
5858
IMAGE := $(REGISTRY)/$(BIN)-$(ARCH)
5959
LEGACY_IMAGE := $(REGISTRY)/$(BIN)
6060

61-
BUILD_IMAGE ?= golang:1.9-alpine
61+
BUILD_IMAGE ?= golang:1.10-alpine
6262

6363
# If you want to build all binaries, see the 'all-build' rule.
6464
# If you want to build all containers, see the 'all-container' rule.
@@ -92,6 +92,7 @@ bin/$(ARCH)/$(BIN): build-dirs
9292
-v $$(pwd)/bin/$(ARCH):/go/bin \
9393
-v $$(pwd)/bin/$(ARCH):/go/bin/linux_$(ARCH) \
9494
-v $$(pwd)/.go/std/$(ARCH):/usr/local/go/pkg/linux_$(ARCH)_static \
95+
-v $$(pwd)/.go/cache:/.cache \
9596
-w /go/src/$(PKG) \
9697
--rm \
9798
$(BUILD_IMAGE) \
@@ -142,6 +143,7 @@ test: build-dirs
142143
-v $$(pwd):/go/src/$(PKG) \
143144
-v $$(pwd)/bin/$(ARCH):/go/bin \
144145
-v $$(pwd)/.go/std/$(ARCH):/usr/local/go/pkg/linux_$(ARCH)_static \
146+
-v $$(pwd)/.go/cache:/.cache \
145147
-w /go/src/$(PKG) \
146148
$(BUILD_IMAGE) \
147149
/bin/sh -c " \
@@ -151,7 +153,7 @@ test: build-dirs
151153

152154
build-dirs:
153155
@mkdir -p bin/$(ARCH)
154-
@mkdir -p .go/src/$(PKG) .go/pkg .go/bin .go/std/$(ARCH)
156+
@mkdir -p .go/src/$(PKG) .go/pkg .go/bin .go/std/$(ARCH) .go/cache
155157

156158
clean: container-clean bin-clean
157159

0 commit comments

Comments
 (0)