Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: Fix build-docker-release-master

Browse Source 
Since the Dockerfile files are now per arch, this adjusts to detect ARCH
and builds docker release from the Dockerfile.<ARCH> file.
This commit is contained in:
Lili Cosic 2021-04-19 17:46:36 +02:00
parent 11249fdee9
commit 81652d16ef
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -12,6 +12,7 @@
UNAME := $(shell uname) UNAME := $(shell uname)
XARGS = xargs XARGS = xargs
ARCH ?= $(shell go env GOARCH)
# -r is only necessary on GNU xargs. # -r is only necessary on GNU xargs.
ifeq ($(UNAME), Linux) ifeq ($(UNAME), Linux)
@ -28,7 +29,7 @@ build:
clean: clean:
rm -f ./codecov rm -f ./codecov
rm -rf ./covdir rm -rf ./covdir
rm -f ./bin/Dockerfile-release rm -f ./bin/Dockerfile-release*
rm -rf ./bin/etcd* rm -rf ./bin/etcd*
rm -rf ./default.etcd rm -rf ./default.etcd
rm -rf ./tests/e2e/default.etcd rm -rf ./tests/e2e/default.etcd
@ -198,13 +199,13 @@ docker-test-coverage:
build-docker-release-master: build-docker-release-master:
$(info ETCD_VERSION: $(ETCD_VERSION)) $(info ETCD_VERSION: $(ETCD_VERSION))
cp ./Dockerfile-release ./bin/Dockerfile-release cp ./Dockerfile-release.$(ARCH) ./bin/Dockerfile-release.$(ARCH)
docker build \ docker build \
--network=host \ --network=host \
--tag gcr.io/etcd-development/etcd:$(ETCD_VERSION) \ --tag gcr.io/etcd-development/etcd:$(ETCD_VERSION) \
--file ./bin/Dockerfile-release \ --file ./bin/Dockerfile-release.$(ARCH) \
./bin ./bin
rm -f ./bin/Dockerfile-release rm -f ./bin/Dockerfile-release.$(ARCH)
docker run \ docker run \
--rm \ --rm \