diff --git a/Makefile b/Makefile index 8e6788b..689bd00 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all swagger install postgres test test-ci \ +.PHONY: all swagger install postgres test test-ci mac \ docker docker-quiet docker-clean SWAG ?= go run github.com/swaggo/swag/cmd/swag@v1.16.4 @@ -10,14 +10,26 @@ GO_ENV += CGO_ENABLED=0 SOURCE := $(shell find . -type f -name '*.go') TARGET := backend -all: swagger docker +all: swagger docker-build-native docker + +mac: swagger docker-build-run docker swagger: $(SWAG) fmt $(SWAG) init -o docs -g cmds/serve.go -pdl 1 -docker: $(TARGET) - $(COMPOSE) up -d --force-recreate --build backend +docker-build-native: $(TARGET) + $(DOCKER) build . --target native \ + -t go2025/backend:native \ + -t go2025/backend:latest + +docker-build-run: + $(DOCKER) build . --target build-run \ + -t go2025/backend:build-run \ + -t go2025/backend:latest + +docker: + $(COMPOSE) up -d --force-recreate backend $(TARGET): $(SOURCE) $(GO_ENV) go build -o $@ diff --git a/docker-compose.yml b/docker-compose.yml index 939cc90..9316c1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,9 +60,7 @@ services: restart: unless-stopped backend: - build: - context: . - target: native + image: go2025/backend:latest env_file: - path: ./.env required: false diff --git a/implements/bunDatabase.go b/implements/bunDatabase.go index 0705b2c..c5f37a3 100644 --- a/implements/bunDatabase.go +++ b/implements/bunDatabase.go @@ -192,7 +192,7 @@ func (self *BunDatabase) UpdateAliases( return err } _, err = tx.NewDelete(). - Model((*models.AliasImage)). + Model((*models.AliasImage)(nil)). Where("image_id = ?", imageId). Exec(ctx) if err != nil {