diff --git a/Dockerfile b/Dockerfile index 1f3da36..231b6d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,3 @@ - FROM gcr.io/distroless/static-debian12 COPY dist/server /app/server ENTRYPOINT ["/app/server"] \ No newline at end of file diff --git a/Makefile b/Makefile index 8cad89c..9386dfc 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,14 @@ IMAGE?=girardinclaire/vehicle-server TAG?=dev +DB_CONTAINER_NAME=vehicle-server-devgo +POSTGRES_USER=vehicle-server +POSTGRES_PASSWORD=secret +POSTGRES_DB=vehicle-server +DATABASE_URL=postgres://$(POSTGRES_USER):$(POSTGRES_PASSWORD)@localhost:5432/$(POSTGRES_DB) + .PHONY: all -all: clean unit_test integration_test dist build package +all: clean dist unit_test integration_test build package .PHONY: clean clean: @@ -29,13 +35,6 @@ integration_test: package: docker build -t $(IMAGE):$(TAG) . - -DB_CONTAINER_NAME=vehicle-server-devgo -POSTGRES_USER=vehicle-server -POSTGRES_PASSWORD=secret -POSTGRES_DB=vehicle-server -DATABASE_URL=postgres://$(POSTGRES_USER):$(POSTGRES_PASSWORD)@localhost:5432/$(POSTGRES_DB) - .PHONY: dev dev: dev_db go run ./cmd/server \