@@ -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 )
@@ -118,12 +118,12 @@ all-container: $(addprefix container-, $(subst /,_, $(DOCKER_PLATFORMS)))
118
118
all-push : $(addprefix push-, $(subst /,_, $(DOCKER_PLATFORMS ) ) )
119
119
120
120
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 )
121
+ @echo ::set-output name=version:: $(VERSION )
122
+ @echo ::set-output name=version_strategy:: $(version_strategy )
123
+ @echo ::set-output name=git_tag:: $(git_tag )
124
+ @echo ::set-output name=git_branch:: $(git_branch )
125
+ @echo ::set-output name=commit_hash:: $(commit_hash )
126
+ @echo ::set-output name=commit_timestamp:: $(commit_timestamp )
127
127
128
128
gen :
129
129
@true
@@ -208,13 +208,13 @@ container: bin/.container-$(DOTFILE_IMAGE)-PROD bin/.container-$(DOTFILE_IMAGE)-
208
208
bin/.container-$(DOTFILE_IMAGE ) -% : bin/$(OS ) _$(ARCH ) /$(BIN ) $(DOCKERFILE_% )
209
209
@echo " container: $( IMAGE) :$( TAG_$* ) "
210
210
@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 )
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 )
218
218
@DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --platform $(OS ) /$(ARCH ) --load --pull -t $(IMAGE ) :$(TAG_$* ) -f bin/.dockerfile-$* -$(OS ) _$(ARCH ) .
219
219
@docker images -q $(IMAGE ) :$(TAG_$* ) > $@
220
220
@echo
0 commit comments