@@ -43,7 +43,7 @@ ALL_ARCH := amd64
43
43
44
44
# Set default base image dynamically for each arch
45
45
ifeq ($(ARCH ) ,amd64)
46
- BASEIMAGE? =alpine:3.4
46
+ BASEIMAGE? =alpine:3.7
47
47
endif
48
48
ifeq ($(ARCH ) ,arm)
49
49
BASEIMAGE? =armel/busybox
58
58
IMAGE := $(REGISTRY ) /$(BIN ) -$(ARCH )
59
59
LEGACY_IMAGE := $(REGISTRY ) /$(BIN )
60
60
61
- BUILD_IMAGE ?= golang:1.9 -alpine
61
+ BUILD_IMAGE ?= golang:1.10 -alpine
62
62
63
63
# If you want to build all binaries, see the 'all-build' rule.
64
64
# If you want to build all containers, see the 'all-container' rule.
@@ -92,6 +92,7 @@ bin/$(ARCH)/$(BIN): build-dirs
92
92
-v $$(pwd ) /bin/$(ARCH ) :/go/bin \
93
93
-v $$(pwd ) /bin/$(ARCH ) :/go/bin/linux_$(ARCH ) \
94
94
-v $$(pwd ) /.go/std/$(ARCH ) :/usr/local/go/pkg/linux_$(ARCH ) _static \
95
+ -v $$(pwd ) /.go/cache:/.cache \
95
96
-w /go/src/$(PKG ) \
96
97
--rm \
97
98
$(BUILD_IMAGE ) \
@@ -142,6 +143,7 @@ test: build-dirs
142
143
-v $$(pwd ) :/go/src/$(PKG ) \
143
144
-v $$(pwd ) /bin/$(ARCH ) :/go/bin \
144
145
-v $$(pwd ) /.go/std/$(ARCH ) :/usr/local/go/pkg/linux_$(ARCH ) _static \
146
+ -v $$(pwd ) /.go/cache:/.cache \
145
147
-w /go/src/$(PKG ) \
146
148
$(BUILD_IMAGE ) \
147
149
/bin/sh -c " \
@@ -151,7 +153,7 @@ test: build-dirs
151
153
152
154
build-dirs :
153
155
@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
155
157
156
158
clean : container-clean bin-clean
157
159
0 commit comments