Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package zli for openSUSE:Factory checked in at 2025-08-04 15:24:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zli (Old) and /work/SRC/openSUSE:Factory/.zli.new.1085 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zli" Mon Aug 4 15:24:55 2025 rev:6 rq:1297349 version:2.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/zli/zli.changes 2025-07-28 14:58:45.267788648 +0200 +++ /work/SRC/openSUSE:Factory/.zli.new.1085/zli.changes 2025-08-04 15:25:18.387212696 +0200 @@ -1,0 +2,6 @@ +Mon Aug 04 04:43:57 UTC 2025 - Johannes Kastl <[email protected]> + +- Update to version 2.1.7: + no CLI-related changes + +------------------------------------------------------------------- Old: ---- zli-2.1.6.obscpio New: ---- zli-2.1.7.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zli.spec ++++++ --- /var/tmp/diff_new_pack.Lf5YXI/_old 2025-08-04 15:25:20.687309314 +0200 +++ /var/tmp/diff_new_pack.Lf5YXI/_new 2025-08-04 15:25:20.687309314 +0200 @@ -17,7 +17,7 @@ Name: zli -Version: 2.1.6 +Version: 2.1.7 Release: 0 Summary: CLI for the Zot container registry License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Lf5YXI/_old 2025-08-04 15:25:20.731311162 +0200 +++ /var/tmp/diff_new_pack.Lf5YXI/_new 2025-08-04 15:25:20.743311666 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/project-zot/zot.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v2.1.6</param> + <param name="revision">v2.1.7</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Lf5YXI/_old 2025-08-04 15:25:20.763312506 +0200 +++ /var/tmp/diff_new_pack.Lf5YXI/_new 2025-08-04 15:25:20.767312674 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/project-zot/zot.git</param> - <param name="changesrevision">966d4584ba7216664d89bfc263f2bceada59f2f3</param></service></servicedata> + <param name="changesrevision">41183693b0104fc19939a73c89c2f3a9f6f946b7</param></service></servicedata> (No newline at EOF) ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/zli/vendor.tar.gz /work/SRC/openSUSE:Factory/.zli.new.1085/vendor.tar.gz differ: char 127, line 1 ++++++ zli-2.1.6.obscpio -> zli-2.1.7.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/Makefile new/zli-2.1.7/Makefile --- old/zli-2.1.6/Makefile 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/Makefile 2025-08-03 17:58:30.000000000 +0200 @@ -31,7 +31,7 @@ ZUI_REPO_NAME := zui SWAGGER_VERSION := v1.16.2 STACKER := $(TOOLSDIR)/bin/stacker -STACKER_VERSION := v0.40.5 +STACKER_VERSION := v1.1.0-rc3 BATS := $(TOOLSDIR)/bin/bats TESTDATA := $(TOP_LEVEL)/test/data OS ?= $(shell go env GOOS) @@ -61,8 +61,10 @@ # freebsd is not supported for pie builds if CGO is disabled # see supported platforms at https://cs.opensource.google/go/go/+/master:src/internal/platform/supported.go;l=222-231;drc=d7fcb5cf80953f1d63246f1ae9defa60c5ce2d76 BUILDMODE_FLAGS := -buildmode=pie +BASE_IMAGE=gcr.io/distroless/base-debian12:latest-$(ARCH) ifeq ($(OS),freebsd) BUILDMODE_FLAGS= + BASE_IMAGE=freebsd/freebsd-static:14.3 endif BIN_EXT := ifeq ($(OS),windows) @@ -440,7 +442,9 @@ .PHONY: binary-container binary-container: - ${CONTAINER_RUNTIME} build ${BUILD_ARGS} -f build/Dockerfile -t zot-build:latest . + ${CONTAINER_RUNTIME} build ${BUILD_ARGS} \ + --build-arg BASE_IMAGE=$(BASE_IMAGE) \ + -f build/Dockerfile -t zot-build:latest . .PHONY: run-container run-container: @@ -449,7 +453,9 @@ .PHONY: binary-minimal-container binary-minimal-container: - ${CONTAINER_RUNTIME} build ${BUILD_ARGS} -f build/Dockerfile-minimal -t zot-minimal:latest . + ${CONTAINER_RUNTIME} build ${BUILD_ARGS} \ + --build-arg BASE_IMAGE=$(BASE_IMAGE) \ + -f build/Dockerfile-minimal -t zot-minimal:latest . .PHONY: run-minimal-container run-minimal-container: @@ -458,7 +464,9 @@ .PHONY: binary-exporter-container binary-exporter-container: - ${CONTAINER_RUNTIME} build ${BUILD_ARGS} -f build/Dockerfile-zxp -t zxp:latest . + ${CONTAINER_RUNTIME} build ${BUILD_ARGS} \ + --build-arg BASE_IMAGE=$(BASE_IMAGE) \ + -f build/Dockerfile-zxp -t zxp:latest . .PHONY: run-exporter-container run-exporter-container: @@ -472,11 +480,14 @@ --substitute ARCH=$(ARCH) \ --substitute OS=$(OS) \ --substitute RELEASE_TAG=$(RELEASE_TAG) \ - --substitute REPO_NAME=zot-$(OS)-$(ARCH) + --substitute REPO_NAME=zot-$(OS)-$(ARCH) \ + --substitute BASE_IMAGE=$(BASE_IMAGE) .PHONY: docker-image docker-image: - ${CONTAINER_RUNTIME} buildx build --platform $(OS)/$(ARCH) -f build/Dockerfile . + ${CONTAINER_RUNTIME} buildx build --platform $(OS)/$(ARCH) \ + --build-arg BASE_IMAGE=$(BASE_IMAGE) \ + -f build/Dockerfile . $(BATS): rm -rf bats-core; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/build/Dockerfile new/zli-2.1.7/build/Dockerfile --- old/zli-2.1.6/build/Dockerfile 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/build/Dockerfile 2025-08-03 17:58:30.000000000 +0200 @@ -28,7 +28,8 @@ # --- # Stage 2: Final image with nothing but certs, binary, and default config file # --- -FROM gcr.io/distroless/base-debian12 AS final +ARG BASE_IMAGE +FROM $BASE_IMAGE AS final ARG TARGETOS ARG TARGETARCH COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/build/Dockerfile-conformance new/zli-2.1.7/build/Dockerfile-conformance --- old/zli-2.1.6/build/Dockerfile-conformance 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/build/Dockerfile-conformance 2025-08-03 17:58:30.000000000 +0200 @@ -24,7 +24,8 @@ # --- # Stage 2: Final image with nothing but certs, binary, and default config file # --- -FROM gcr.io/distroless/base-debian12 AS final +ARG BASE_IMAGE +FROM $BASE_IMAGE AS final ARG TARGETOS ARG TARGETARCH COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/build/Dockerfile-minimal new/zli-2.1.7/build/Dockerfile-minimal --- old/zli-2.1.6/build/Dockerfile-minimal 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/build/Dockerfile-minimal 2025-08-03 17:58:30.000000000 +0200 @@ -27,7 +27,8 @@ # --- # Stage 2: Final image with nothing but certs, binary, and default config file # --- -FROM gcr.io/distroless/base-debian12 AS final +ARG BASE_IMAGE +FROM $BASE_IMAGE AS final ARG TARGETOS ARG TARGETARCH COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/build/Dockerfile-zb new/zli-2.1.7/build/Dockerfile-zb --- old/zli-2.1.6/build/Dockerfile-zb 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/build/Dockerfile-zb 2025-08-03 17:58:30.000000000 +0200 @@ -15,7 +15,8 @@ # --- # Stage 2: Final image with nothing but certs, binary, and default config file # --- -FROM gcr.io/distroless/base-debian12 AS final +ARG BASE_IMAGE +FROM BASE_IMAGE AS final ARG TARGETOS ARG TARGETARCH COPY --from=builder /go/src/github.com/project-zot/zot/bin/zb-$TARGETOS-$TARGETARCH /usr/bin/zb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/build/Dockerfile-zxp new/zli-2.1.7/build/Dockerfile-zxp --- old/zli-2.1.6/build/Dockerfile-zxp 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/build/Dockerfile-zxp 2025-08-03 17:58:30.000000000 +0200 @@ -28,7 +28,8 @@ # --- # Stage 2: Final image with nothing but binary and default config file # --- -FROM gcr.io/distroless/base-debian12 AS final +ARG BASE_IMAGE +FROM $BASE_IMAGE AS final ARG TARGETOS ARG TARGETARCH COPY --from=builder /go/src/github.com/project-zot/zot/bin/zxp-$TARGETOS-$TARGETARCH /zxp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/build/multiarch-zb.json new/zli-2.1.7/build/multiarch-zb.json --- old/zli-2.1.6/build/multiarch-zb.json 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/build/multiarch-zb.json 2025-08-03 17:58:30.000000000 +0200 @@ -3,7 +3,7 @@ "source_repos": [ "zb-linux-amd64", "zb-linux-arm64", - "zb-darwin-amd64", - "zb-darwin-arm64" + "zb-freebsd-amd64", + "zb-freebsd-arm64" ] -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/build/multiarch-zot-minimal.json new/zli-2.1.7/build/multiarch-zot-minimal.json --- old/zli-2.1.6/build/multiarch-zot-minimal.json 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/build/multiarch-zot-minimal.json 2025-08-03 17:58:30.000000000 +0200 @@ -3,7 +3,7 @@ "source_repos": [ "zot-minimal-linux-amd64", "zot-minimal-linux-arm64", - "zot-minimal-darwin-amd64", - "zot-minimal-darwin-arm64" + "zot-minimal-freebsd-amd64", + "zot-minimal-freebsd-arm64" ] -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/build/multiarch-zot.json new/zli-2.1.7/build/multiarch-zot.json --- old/zli-2.1.6/build/multiarch-zot.json 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/build/multiarch-zot.json 2025-08-03 17:58:30.000000000 +0200 @@ -3,7 +3,7 @@ "source_repos": [ "zot-linux-amd64", "zot-linux-arm64", - "zot-darwin-amd64", - "zot-darwin-arm64" + "zot-freebsd-amd64", + "zot-freebsd-arm64" ] -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/build/multiarch-zxp.json new/zli-2.1.7/build/multiarch-zxp.json --- old/zli-2.1.6/build/multiarch-zxp.json 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/build/multiarch-zxp.json 2025-08-03 17:58:30.000000000 +0200 @@ -3,7 +3,7 @@ "source_repos": [ "zxp-linux-amd64", "zxp-linux-arm64", - "zxp-darwin-amd64", - "zxp-darwin-arm64" + "zxp-freebsd-amd64", + "zxp-freebsd-arm64" ] -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/build/stacker-conformance.yaml new/zli-2.1.7/build/stacker-conformance.yaml --- old/zli-2.1.6/build/stacker-conformance.yaml 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/build/stacker-conformance.yaml 2025-08-03 17:58:30.000000000 +0200 @@ -48,7 +48,7 @@ arch: ${{ARCH}} from: type: docker - url: docker://gcr.io/distroless/base-debian12:latest-${{ARCH}} + url: docker://${{BASE_IMAGE}} overlay_dirs: - source: ../.build/${{REPO_NAME}}/binary dest: /usr/local/bin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/build/stacker-minimal.yaml new/zli-2.1.7/build/stacker-minimal.yaml --- old/zli-2.1.6/build/stacker-minimal.yaml 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/build/stacker-minimal.yaml 2025-08-03 17:58:30.000000000 +0200 @@ -47,7 +47,7 @@ arch: ${{ARCH}} from: type: docker - url: docker://gcr.io/distroless/base-debian12:latest-${{ARCH}} + url: docker://${{BASE_IMAGE}} overlay_dirs: - source: ../.build/${{REPO_NAME}}/binary dest: /usr/local/bin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/build/stacker-zb.yaml new/zli-2.1.7/build/stacker-zb.yaml --- old/zli-2.1.6/build/stacker-zb.yaml 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/build/stacker-zb.yaml 2025-08-03 17:58:30.000000000 +0200 @@ -26,7 +26,7 @@ arch: ${{ARCH}} from: type: docker - url: docker://gcr.io/distroless/base-debian12:latest-${{ARCH}} + url: docker://${{BASE_IMAGE}} overlay_dirs: - source: ../.build/${{REPO_NAME}}/binary dest: /usr/local/bin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/build/stacker-zxp.yaml new/zli-2.1.7/build/stacker-zxp.yaml --- old/zli-2.1.6/build/stacker-zxp.yaml 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/build/stacker-zxp.yaml 2025-08-03 17:58:30.000000000 +0200 @@ -46,7 +46,7 @@ arch: ${{ARCH}} from: type: docker - url: docker://gcr.io/distroless/base-debian12:latest-${{ARCH}} + url: docker://${{BASE_IMAGE}} overlay_dirs: - source: ../.build/${{REPO_NAME}}/binary dest: /usr/local/bin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/build/stacker.yaml new/zli-2.1.7/build/stacker.yaml --- old/zli-2.1.6/build/stacker.yaml 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/build/stacker.yaml 2025-08-03 17:58:30.000000000 +0200 @@ -62,7 +62,7 @@ arch: ${{ARCH}} from: type: docker - url: docker://gcr.io/distroless/base-debian12:latest-${{ARCH}} + url: docker://${{BASE_IMAGE}} overlay_dirs: - source: ../.build/${{REPO_NAME}}/binary dest: /usr/local/bin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/go.mod new/zli-2.1.7/go.mod --- old/zli-2.1.6/go.mod 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/go.mod 2025-08-03 17:58:30.000000000 +0200 @@ -226,7 +226,7 @@ github.com/dlclark/regexp2 v1.11.2 // indirect github.com/docker/cli v28.2.2+incompatible // indirect github.com/docker/distribution v2.8.3+incompatible // indirect - github.com/docker/docker v28.2.2+incompatible // indirect + github.com/docker/docker v28.3.3+incompatible // indirect github.com/docker/docker-credential-helpers v0.9.3 // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-metrics v0.0.1 // indirect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/go.sum new/zli-2.1.7/go.sum --- old/zli-2.1.6/go.sum 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/go.sum 2025-08-03 17:58:30.000000000 +0200 @@ -1081,8 +1081,8 @@ github.com/docker/cli v28.2.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw= -github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI= +github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8= github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/pkg/api/controller.go new/zli-2.1.7/pkg/api/controller.go --- old/zli-2.1.6/pkg/api/controller.go 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/pkg/api/controller.go 2025-08-03 17:58:30.000000000 +0200 @@ -455,12 +455,18 @@ } func (c *Controller) Shutdown() { + // stop all background tasks c.StopBackgroundTasks() if c.Server != nil { ctx := context.Background() _ = c.Server.Shutdown(ctx) } + + // close metadb + if c.MetaDB != nil { + c.MetaDB.Close() + } } // Will stop scheduler and wait for all tasks to finish their work. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/pkg/meta/boltdb/boltdb.go new/zli-2.1.7/pkg/meta/boltdb/boltdb.go --- old/zli-2.1.6/pkg/meta/boltdb/boltdb.go 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/pkg/meta/boltdb/boltdb.go 2025-08-03 17:58:30.000000000 +0200 @@ -2102,3 +2102,10 @@ return err } + +func (bdw *BoltDB) Close() error { + err := bdw.DB.Close() + bdw.DB = nil + + return err +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/pkg/meta/dynamodb/dynamodb.go new/zli-2.1.7/pkg/meta/dynamodb/dynamodb.go --- old/zli-2.1.6/pkg/meta/dynamodb/dynamodb.go 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/pkg/meta/dynamodb/dynamodb.go 2025-08-03 17:58:30.000000000 +0200 @@ -2274,3 +2274,7 @@ return version, nil } + +func (dwr *DynamoDB) Close() error { + return nil +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/pkg/meta/meta.go new/zli-2.1.7/pkg/meta/meta.go --- old/zli-2.1.6/pkg/meta/meta.go 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/pkg/meta/meta.go 2025-08-03 17:58:30.000000000 +0200 @@ -147,3 +147,7 @@ return str, true } + +func Close(metadb mTypes.MetaDB) error { + return metadb.Close() +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/pkg/meta/redis/redis.go new/zli-2.1.7/pkg/meta/redis/redis.go --- old/zli-2.1.6/pkg/meta/redis/redis.go 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/pkg/meta/redis/redis.go 2025-08-03 17:58:30.000000000 +0200 @@ -2321,3 +2321,10 @@ func join(xs ...string) string { return strings.Join(xs, ":") } + +func (rc *RedisDB) Close() error { + err := rc.Client.Close() + rc.Client = nil + + return err +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/pkg/meta/types/types.go new/zli-2.1.7/pkg/meta/types/types.go --- old/zli-2.1.6/pkg/meta/types/types.go 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/pkg/meta/types/types.go 2025-08-03 17:58:30.000000000 +0200 @@ -156,6 +156,9 @@ ImageTrustStore() ImageTrustStore SetImageTrustStore(imgTrustStore ImageTrustStore) + + // Close will close the db + Close() error } type UserDB interface { //nolint:interfacebloat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/pkg/storage/imagestore/imagestore.go new/zli-2.1.7/pkg/storage/imagestore/imagestore.go --- old/zli-2.1.6/pkg/storage/imagestore/imagestore.go 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/pkg/storage/imagestore/imagestore.go 2025-08-03 17:58:30.000000000 +0200 @@ -943,7 +943,9 @@ defer file.Close() - if from != file.Size() { + fsize := file.Size() + + if from != fsize { is.log.Error().Int64("expected", from).Int64("actual", file.Size()). Msg("invalid range start for blob upload") @@ -952,7 +954,7 @@ n, err := io.Copy(file, body) - return n, err + return n + fsize, err } // BlobUploadInfo returns the current blob size in bytes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/pkg/storage/storage_test.go new/zli-2.1.7/pkg/storage/storage_test.go --- old/zli-2.1.6/pkg/storage/storage_test.go 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/pkg/storage/storage_test.go 2025-08-03 17:58:30.000000000 +0200 @@ -493,7 +493,7 @@ bupload, err = imgStore.PutBlobChunk("test", upload, int64(firstChunkLen), int64(buflen), secondChunkBuf) So(err, ShouldBeNil) - So(bupload, ShouldEqual, secondChunkLen) + So(bupload, ShouldEqual, int64(firstChunkLen+secondChunkLen)) err = imgStore.FinishBlobUpload("test", upload, buf, digest) So(err, ShouldBeNil) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zli-2.1.6/pkg/test/mocks/repo_db_mock.go new/zli-2.1.7/pkg/test/mocks/repo_db_mock.go --- old/zli-2.1.6/pkg/test/mocks/repo_db_mock.go 2025-07-26 09:10:26.000000000 +0200 +++ new/zli-2.1.7/pkg/test/mocks/repo_db_mock.go 2025-08-03 17:58:30.000000000 +0200 @@ -103,6 +103,8 @@ GetAllRepoNamesFn func() ([]string, error) ResetDBFn func() error + + CloseFn func() error } func (sdm MetaDBMock) DeleteRepoMeta(repo string) error { @@ -460,4 +462,12 @@ } return nil +} + +func (sdm MetaDBMock) Close() error { + if sdm.CloseFn != nil { + return sdm.CloseFn() + } + + return nil } ++++++ zli.obsinfo ++++++ --- /var/tmp/diff_new_pack.Lf5YXI/_old 2025-08-04 15:25:21.423340231 +0200 +++ /var/tmp/diff_new_pack.Lf5YXI/_new 2025-08-04 15:25:21.427340399 +0200 @@ -1,5 +1,5 @@ name: zli -version: 2.1.6 -mtime: 1753513826 -commit: 966d4584ba7216664d89bfc263f2bceada59f2f3 +version: 2.1.7 +mtime: 1754236710 +commit: 41183693b0104fc19939a73c89c2f3a9f6f946b7
