From 94381662771eb1814d5d659fe162051a1bfbffce Mon Sep 17 00:00:00 2001 From: "Felipe M." Date: Mon, 13 May 2024 20:15:48 +0200 Subject: [PATCH] build-local to speed up local tests --- Makefile | 8 ++++++-- scripts/buildx.sh | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index eb3a0f1b3..7890f4db3 100644 --- a/Makefile +++ b/Makefile @@ -107,14 +107,18 @@ styles-check: build: clean GIN_MODE=$(GIN_MODE) goreleaser build --clean --snapshot +## Build binary for current targer +build-local: + GIN_MODE=$(GIN_MODE) goreleaser build --clean --snapshot --single-target + ## Build docker image using Buildx .PHONY: buildx -buildx: +buildx: clean $(info: Make: Buildx) @bash scripts/buildx.sh ## Build docker image for local development -buildx-local: +buildx-local: build-local $(info: Make: Build image locally) CONTAINER_BUILDX_OPTIONS="-t shiori:localdev --output type=docker" BUILDX_PLATFORMS=$(LOCAL_BUILD_PLATFORM) scripts/buildx.sh diff --git a/scripts/buildx.sh b/scripts/buildx.sh index f806d68b1..5cbca328e 100755 --- a/scripts/buildx.sh +++ b/scripts/buildx.sh @@ -9,8 +9,13 @@ if [ "$CONTAINER_RUNTIME" == "docker" ]; then fi fi -cp -r dist/shiori_linux_arm_7 dist/shiori_linux_armv7 -cp -r dist/shiori_linux_amd64_v1 dist/shiori_linux_amd64 +if [ -d dist/shiori_linux_arm_7 ]; then + cp -r dist/shiori_linux_arm_7 dist/shiori_linux_armv7 +fi + +if [ -d dist/shiori_linux_amd64_v1 ]; then + cp -r dist/shiori_linux_amd64_v1 dist/shiori_linux_amd64 +fi $CONTAINER_RUNTIME buildx build \ -f ${CONTAINERFILE_NAME} \