diff --git a/CHANGELOG.md b/CHANGELOG.md index da25bda2..b35cf5c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -166,7 +166,7 @@ Bringing support for streaming chat in Glide. - 🔧 [chores] Automatic coverage reports #39 (@roma-glushko) - 👷 [build] Setup release workflows #9 (@roma-glushko) -[unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/0.0.3...HEAD +[unreleased]: https://github.com/EinStack/glide/compare/0.0.3...HEAD [0.0.3]: https://github.com/EinStack/glide/compare/0.0.3-rc.1..0.0.3 [0.0.3-rc.2]: https://github.com/EinStack/glide/compare/0.0.3-rc.1..0.0.3-rc.2 [0.0.3-rc.1]: https://github.com/EinStack/glide/compare/0.0.2..0.0.3-rc.1 diff --git a/Makefile b/Makefile index 4cebf96b..9c263910 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ CHECKER_BIN=$(PWD)/tmp/bin -VERSION_PACKAGE := glide/pkg +VERSION_PACKAGE := glide/pkg/version COMMIT ?= $(shell git describe --dirty --long --always --abbrev=15) BUILD_DATE ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") VERSION ?= "latest" -LDFLAGS_COMMON := "-s -w -X $(VERSION_PACKAGE).commitSha=$(COMMIT) -X $(VERSION_PACKAGE).version=$(VERSION) -X $(VERSION_PACKAGE).buildDate=$(BUILD_DATE)" +LDFLAGS_COMMON := "-s -w -X $(VERSION_PACKAGE).commitSha=$(COMMIT) -X $(VERSION_PACKAGE).Version=$(VERSION) -X $(VERSION_PACKAGE).buildDate=$(BUILD_DATE)" .PHONY: help @@ -40,7 +40,11 @@ run: ## Run Glide @go run -ldflags $(LDFLAGS_COMMON) main.go -c ./config.dev.yaml build: ## Build Glide - @go build -ldflags $(LDFLAGS_COMMON) -o ./dist/glide + @echo "🔨Building Glide binary.." + @echo "Version: $(VERSION)" + @echo "Commit: $(COMMIT)" + @echo "Build Date: $(BUILD_DATE)" + @go build -ldflags $(LDFLAGS_COMMON) -o ./dist/glide; test: ## Run tests @go test -v -count=1 -race -shuffle=on -coverprofile=coverage.txt ./... diff --git a/images/Makefile b/images/Makefile index 145f8b59..d87148ac 100644 --- a/images/Makefile +++ b/images/Makefile @@ -2,7 +2,7 @@ VENDOR ?= einstack PROJECT ?= Glide SOURCE ?= https://github.com/EinStack/glide LICENSE ?= Apache-2.0 -DESCRIPTION ?= "A lightweight, cloud-native LLM gateway" +DESCRIPTION ?= "A lightweight, cloud-native fast LLM gateway" REPOSITORY ?= einstack/glide VERSION ?= dev @@ -10,7 +10,6 @@ RC_PART ?= rc COMMIT ?= $(shell git describe --dirty --always --abbrev=15) BUILD_DATE ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") - # OCI Labels: https://specs.opencontainers.org/image-spec/annotations # Test images via: docker run --rm --platform linux/amd64 -i einstack/glide:dev-alpine --config config.dev.yaml diff --git a/images/alpine.Dockerfile b/images/alpine.Dockerfile index 26b20357..e9ab71c4 100644 --- a/images/alpine.Dockerfile +++ b/images/alpine.Dockerfile @@ -11,7 +11,7 @@ WORKDIR /build COPY . /build/ RUN go mod download -RUN go build -ldflags "-s -w -X glide/pkg.version=$VERSION -X glide/pkg.commitSha=$COMMIT -X glide/pkg.buildDate=$BUILD_DATE" -o /build/dist/glide +RUN go build -ldflags "-s -w -X glide/pkg/version.Version=$VERSION -X glide/pkg/version.commitSha=$COMMIT -X glide/pkg/version.buildDate=$BUILD_DATE" -o /build/dist/glide FROM alpine:3.19 as release diff --git a/images/distroless.Dockerfile b/images/distroless.Dockerfile index 23167563..249b8c62 100644 --- a/images/distroless.Dockerfile +++ b/images/distroless.Dockerfile @@ -11,7 +11,7 @@ WORKDIR /build COPY . /build/ RUN go mod download -RUN go build -ldflags "-s -w -X glide/pkg.version=$VERSION -X glide/pkg.commitSha=$COMMIT -X glide/pkg.buildDate=$BUILD_DATE" -o /build/dist/glide +RUN go build -ldflags "-s -w -X glide/pkg/version.Version=$VERSION -X glide/pkg/version.commitSha=$COMMIT -X glide/pkg/version.buildDate=$BUILD_DATE" -o /build/dist/glide FROM gcr.io/distroless/static-debian12:nonroot as release diff --git a/images/redhat.Dockerfile b/images/redhat.Dockerfile index c3a16248..aacdc0aa 100644 --- a/images/redhat.Dockerfile +++ b/images/redhat.Dockerfile @@ -11,7 +11,7 @@ WORKDIR /build COPY . /build/ RUN go mod download -RUN go build -ldflags "-s -w -X glide/pkg.version=$VERSION -X glide/pkg.commitSha=$COMMIT -X glide/pkg.buildDate=$BUILD_DATE" -o /build/dist/glide +RUN go build -ldflags "-s -w -X glide/pkg/version.version=$VERSION -X glide/pkg/version.commitSha=$COMMIT -X glide/pkg/version.buildDate=$BUILD_DATE" -o /build/dist/glide FROM redhat/ubi8-micro:8.9 as release diff --git a/images/ubuntu.Dockerfile b/images/ubuntu.Dockerfile index fe238b79..78c8e024 100644 --- a/images/ubuntu.Dockerfile +++ b/images/ubuntu.Dockerfile @@ -11,7 +11,7 @@ WORKDIR /build COPY . /build/ RUN go mod download -RUN go build -ldflags "-s -w -X glide/pkg.version=$VERSION -X glide/pkg.commitSha=$COMMIT -X glide/pkg.buildDate=$BUILD_DATE" -o /build/dist/glide +RUN go build -ldflags "-s -w -X glide/pkg/version.version=$VERSION -X glide/pkg/version.commitSha=$COMMIT -X glide/pkg/version.buildDate=$BUILD_DATE" -o /build/dist/glide FROM ubuntu:22.04 as release