Makefile (etcd-3.5.6) | : | Makefile (etcd-3.5.7) | ||
---|---|---|---|---|
skipping to change at line 54 | skipping to change at line 54 | |||
docker-start: | docker-start: | |||
service docker restart | service docker restart | |||
docker-kill: | docker-kill: | |||
docker kill `docker ps -q` || true | docker kill `docker ps -q` || true | |||
docker-remove: | docker-remove: | |||
docker rm --force `docker ps -a -q` || true | docker rm --force `docker ps -a -q` || true | |||
docker rmi --force `docker images -q` || true | docker rmi --force `docker images -q` || true | |||
GO_VERSION ?= 1.16.15 | GO_VERSION ?= 1.17.13 | |||
ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound") | ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound") | |||
TEST_SUFFIX = $(shell date +%s | base64 | head -c 15) | TEST_SUFFIX = $(shell date +%s | base64 | head -c 15) | |||
TEST_OPTS ?= PASSES='unit' | TEST_OPTS ?= PASSES='unit' | |||
TMP_DIR_MOUNT_FLAG = --tmpfs=/tmp:exec | TMP_DIR_MOUNT_FLAG = --tmpfs=/tmp:exec | |||
ifdef HOST_TMP_DIR | ifdef HOST_TMP_DIR | |||
TMP_DIR_MOUNT_FLAG = --mount type=bind,source=$(HOST_TMP_DIR),destination =/tmp | TMP_DIR_MOUNT_FLAG = --mount type=bind,source=$(HOST_TMP_DIR),destination =/tmp | |||
endif | endif | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |