From 200485e91fb25e067753444a8dbc6c06c4cd0770 Mon Sep 17 00:00:00 2001 From: Ping-Lin Chang Date: Fri, 27 Oct 2023 21:42:12 +0100 Subject: [PATCH] ci(Makefile): build latest images always --- Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Makefile b/Makefile index f7eb10c4..cd25c62c 100644 --- a/Makefile +++ b/Makefile @@ -55,16 +55,7 @@ all: ## Launch all services with their up-to-date release version .PHONY: latest latest: ## Lunch all dependent services with their latest codebase - @if [ "${BUILD}" = "true" ]; then make build-latest; fi - @if [ ! "$$(docker image inspect ${CONTAINER_COMPOSE_IMAGE_NAME}:latest --format='yes' 2> /dev/null)" = "yes" ]; then \ - docker build --progress plain \ - --build-arg ALPINE_VERSION=${ALPINE_VERSION} \ - --build-arg GOLANG_VERSION=${GOLANG_VERSION} \ - --build-arg K6_VERSION=${K6_VERSION} \ - --build-arg CACHE_DATE="$(shell date)" \ - --target latest \ - -t ${CONTAINER_COMPOSE_IMAGE_NAME}:latest .; \ - fi + @make build-latest @if ! docker compose ls -q | grep -q "instill-core"; then \ export TMP_CONFIG_DIR=$(shell mktemp -d) && \ export SYSTEM_CONFIG_PATH=$(shell eval echo ${SYSTEM_CONFIG_PATH}) && \