@@ -69,7 +69,7 @@ TAG := $(VERSION)_$(OS)_$(ARCH)
69
69
TAG_PROD := $(TAG )
70
70
TAG_DBG := $(VERSION ) -dbg_$(OS ) _$(ARCH )
71
71
72
- GO_VERSION ?= 1.12.7
72
+ GO_VERSION ?= 1.12.10
73
73
BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION ) -stretch
74
74
75
75
OUTBIN = bin/$(OS ) _$(ARCH ) /$(BIN )
80
80
# Directories that we need created to build/test.
81
81
BUILD_DIRS := bin/$(OS ) _$(ARCH ) \
82
82
.go/bin/$(OS ) _$(ARCH ) \
83
- .go/cache
83
+ .go/cache \
84
+ $(HOME ) /.credentials \
85
+ $(HOME ) /.kube \
86
+ $(HOME ) /.minikube
84
87
85
88
DOCKERFILE_PROD = Dockerfile.in
86
89
DOCKERFILE_DBG = Dockerfile.dbg
@@ -118,15 +121,15 @@ all-container: $(addprefix container-, $(subst /,_, $(DOCKER_PLATFORMS)))
118
121
all-push : $(addprefix push-, $(subst /,_, $(DOCKER_PLATFORMS ) ) )
119
122
120
123
version :
121
- @echo version= $(VERSION )
122
- @echo version_strategy= $(version_strategy )
123
- @echo git_tag= $(git_tag )
124
- @echo git_branch= $(git_branch )
125
- @echo commit_hash= $(commit_hash )
126
- @echo commit_timestamp= $(commit_timestamp )
124
+ @echo ::set-output name=version:: $(VERSION )
125
+ @echo ::set-output name=version_strategy:: $(version_strategy )
126
+ @echo ::set-output name=git_tag:: $(git_tag )
127
+ @echo ::set-output name=git_branch:: $(git_branch )
128
+ @echo ::set-output name=commit_hash:: $(commit_hash )
129
+ @echo ::set-output name=commit_timestamp:: $(commit_timestamp )
127
130
128
131
gen :
129
- ./hack/codegen.sh
132
+ @true
130
133
131
134
fmt : $(BUILD_DIRS )
132
135
@docker run \
@@ -208,13 +211,13 @@ container: bin/.container-$(DOTFILE_IMAGE)-PROD bin/.container-$(DOTFILE_IMAGE)-
208
211
bin/.container-$(DOTFILE_IMAGE ) -% : bin/$(OS ) _$(ARCH ) /$(BIN ) $(DOCKERFILE_% )
209
212
@echo " container: $( IMAGE) :$( TAG_$* ) "
210
213
@sed \
211
- -e ' s|{ARG_BIN}|$(BIN)|g' \
212
- -e ' s|{ARG_ARCH}|$(ARCH)|g' \
213
- -e ' s|{ARG_OS}|$(OS)|g' \
214
- -e ' s|{ARG_FROM}|$(BASEIMAGE_$*)|g' \
215
- -e ' s|{RESTIC_VER}|$(RESTIC_VER)|g' \
216
- -e ' s|{NEW_RESTIC_VER}|$(NEW_RESTIC_VER)|g' \
217
- $(DOCKERFILE_$* ) > bin/.dockerfile-$* -$(OS ) _$(ARCH )
214
+ -e ' s|{ARG_BIN}|$(BIN)|g' \
215
+ -e ' s|{ARG_ARCH}|$(ARCH)|g' \
216
+ -e ' s|{ARG_OS}|$(OS)|g' \
217
+ -e ' s|{ARG_FROM}|$(BASEIMAGE_$*)|g' \
218
+ -e ' s|{RESTIC_VER}|$(RESTIC_VER)|g' \
219
+ -e ' s|{NEW_RESTIC_VER}|$(NEW_RESTIC_VER)|g' \
220
+ $(DOCKERFILE_$* ) > bin/.dockerfile-$* -$(OS ) _$(ARCH )
218
221
@DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --platform $(OS ) /$(ARCH ) --load --pull -t $(IMAGE ) :$(TAG_$* ) -f bin/.dockerfile-$* -$(OS ) _$(ARCH ) .
219
222
@docker images -q $(IMAGE ) :$(TAG_$* ) > $@
220
223
@echo
0 commit comments