From 96226af869276e46a2494a854283790dd93fb003 Mon Sep 17 00:00:00 2001 From: Ramkumar Chinchani Date: Sat, 4 Dec 2021 03:50:58 +0000 Subject: [PATCH] move references to zotregistry.io and project-zot Signed-off-by: Ramkumar Chinchani --- .github/workflows/ci-cd.yml | 2 +- .github/workflows/oci-conformance-action.yml | 4 ++-- COMPARISON.md | 11 +++++++++-- CONTRIBUTING.md | 12 ++++++------ Dockerfile | 8 ++++---- Dockerfile-arch | 8 ++++---- Dockerfile-arch-minimal | 8 ++++---- Dockerfile-conformance | 8 ++++---- Dockerfile-minimal | 8 ++++---- Makefile | 8 ++++---- README.md | 16 ++++++++-------- cmd/exporter/main.go | 3 ++- cmd/zot/main.go | 2 +- cmd/zot/main_test.go | 6 +++--- examples/metrics/Dockerfile | 10 +++++----- examples/metrics/Dockerfile-exporter | 10 +++++----- examples/metrics/Dockerfile-minimal | 10 +++++----- examples/metrics/Makefile | 6 +++--- examples/zot.service | 2 +- go.mod | 2 +- pkg/api/authn.go | 4 ++-- pkg/api/authz.go | 4 ++-- pkg/api/config/config.go | 6 +++--- pkg/api/controller.go | 14 +++++++------- pkg/api/controller_test.go | 10 +++++----- pkg/api/errors.go | 2 +- pkg/api/errors_test.go | 2 +- pkg/api/ldap.go | 4 ++-- pkg/api/routes.go | 10 +++++----- pkg/api/session.go | 4 ++-- pkg/cli/cli.go | 1 + pkg/cli/client.go | 5 +++-- pkg/cli/client_test.go | 7 ++++--- pkg/cli/config_cmd.go | 3 ++- pkg/cli/config_cmd_test.go | 3 ++- pkg/cli/cve_cmd.go | 3 ++- pkg/cli/cve_cmd_test.go | 11 ++++++----- pkg/cli/image_cmd.go | 3 ++- pkg/cli/image_cmd_test.go | 11 ++++++----- pkg/cli/minimal.go | 1 + pkg/cli/root.go | 8 ++++---- pkg/cli/root_test.go | 4 ++-- pkg/cli/searcher.go | 3 ++- pkg/cli/service.go | 3 ++- pkg/compliance/v1_0_0/check.go | 6 +++--- pkg/compliance/v1_0_0/check_test.go | 10 +++++----- pkg/exporter/api/config.go | 1 + pkg/exporter/api/controller.go | 3 ++- pkg/exporter/api/controller_test.go | 11 ++++++----- pkg/exporter/api/exporter.go | 5 +++-- pkg/exporter/cli/cli.go | 5 +++-- pkg/extensions/config/config.go | 2 +- pkg/extensions/extensions.go | 12 ++++++------ pkg/extensions/minimal.go | 7 ++++--- pkg/extensions/monitoring/extension.go | 3 ++- pkg/extensions/monitoring/minimal.go | 3 ++- pkg/extensions/monitoring/minimal_client.go | 3 ++- pkg/extensions/search/common/common.go | 2 +- pkg/extensions/search/common/common_test.go | 17 +++++++++-------- pkg/extensions/search/common/oci_layout.go | 6 +++--- pkg/extensions/search/cve/cve.go | 6 +++--- pkg/extensions/search/cve/cve_test.go | 19 ++++++++++--------- pkg/extensions/search/cve/models.go | 6 +++--- pkg/extensions/search/digest/digest.go | 6 +++--- pkg/extensions/search/digest/digest_test.go | 17 +++++++++-------- pkg/extensions/search/resolver.go | 10 +++++----- pkg/extensions/sync/http_handler.go | 4 ++-- pkg/extensions/sync/on_demand.go | 4 ++-- pkg/extensions/sync/sync.go | 6 +++--- pkg/extensions/sync/sync_internal_test.go | 10 +++++----- pkg/extensions/sync/sync_test.go | 11 ++++++----- pkg/extensions/sync/utils.go | 8 ++++---- pkg/log/log_test.go | 7 ++++--- pkg/storage/cache.go | 4 ++-- pkg/storage/cache_test.go | 6 +++--- pkg/storage/s3/s3_test.go | 10 +++++----- pkg/storage/s3/storage.go | 8 ++++---- pkg/storage/storage_fs.go | 6 +++--- pkg/storage/storage_fs_test.go | 8 ++++---- pkg/storage/storage_test.go | 8 ++++---- stacker.yaml | 6 +++--- swagger/docs_test.go | 2 +- test/common_test.go | 3 ++- 83 files changed, 288 insertions(+), 253 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 5e879b31..8fb9b9e9 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -11,7 +11,7 @@ on: name: build-test jobs: build-test: - name: Build and test zot + name: Build and test ZOT runs-on: ubuntu-latest services: s3mock: diff --git a/.github/workflows/oci-conformance-action.yml b/.github/workflows/oci-conformance-action.yml index 78414551..03b44dad 100644 --- a/.github/workflows/oci-conformance-action.yml +++ b/.github/workflows/oci-conformance-action.yml @@ -28,7 +28,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} path: zot - repository: anuvu/zot + repository: project-zot/zot - name: start zot server run: | cd ./zot @@ -36,7 +36,7 @@ jobs: echo "SERVER_URL=http://${IP}:5000" >> $GITHUB_ENV IMAGE_REF="local-zot:v$(date +%Y%m%d%H%M%S)" docker build -f ./Dockerfile-conformance -t "${IMAGE_REF}" . - docker run --rm -p 5000:5000 -v "$(pwd)":/go/src/github.com/anuvu/zot -idt "${IMAGE_REF}" + docker run --rm -p 5000:5000 -v "$(pwd)":/go/src/github.com/project-zot/zot -idt "${IMAGE_REF}" - name: Run OCI Distribution Spec conformance tests uses: opencontainers/distribution-spec@main env: diff --git a/COMPARISON.md b/COMPARISON.md index 16b9b76d..7ba8c730 100644 --- a/COMPARISON.md +++ b/COMPARISON.md @@ -25,6 +25,7 @@ Please see [documentation](./examples/README.md) for various configuration optio | **External contributions** | yes | yes | | **CNCF project** | yes [9] | no | | **dist-spec conformance** | pending 3.x release [10][11] | yes [12] | +| **Image Signatures** | auxiliary [13] | built-in [14][15] | \* NOTE: "minimal build" criterion above means the ability to build a minimal distribution-spec compliant registry in order to reduce library dependencies @@ -46,7 +47,7 @@ and the possible attack surface. [7] https://github.com/parabuzzle/craneoperator -[8] https://github.com/anuvu/zot-ui +[8] https://github.com/project-zot/zot-ui [9] https://www.docker.com/blog/donating-docker-distribution-to-the-cncf/ @@ -54,4 +55,10 @@ and the possible attack surface. [11] https://github.com/opencontainers/oci-conformance/tree/main/distribution-spec#distributiondistribution -[12] https://github.com/opencontainers/oci-conformance/tree/main/distribution-spec#anuvuzot +[12] https://github.com/opencontainers/oci-conformance/tree/main/distribution-spec#project-zotzot + +[13] https://docs.docker.com/engine/security/trust/ + +[14] https://github.com/notaryproject/notation + +[15] https://github.com/sigstore/cosign diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 93f79588..0f3d2f76 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,20 +2,20 @@ ## Fork Repository -[Fork](https://github.com/anuvu/zot) the zot repository on GitHub to your personal account. +[Fork](https://github.com/project-zot/zot) the zot repository on GitHub to your personal account. ``` #Set golang environment export GOPATH=$HOME/go -mkdir -p $GOPATH/src/github.com/anuvu +mkdir -p $GOPATH/src/github.com/project-zot #Get code -go get github.com/anuvu/zot -cd $GOPATH/src/github.com/anuvu/zot +go get github.com/project-zot/zot +cd $GOPATH/src/github.com/project-zot/zot #Track repository under your personal account -git config push.default nothing # Anything to avoid pushing to anuvu/zot by default -git remote rename origin anuvu +git config push.default nothing # Anything to avoid pushing to project-zot/zot by default +git remote rename origin project-zot git remote add $USER git@github.com:$USER/zot.git git fetch $USER diff --git a/Dockerfile b/Dockerfile index a5130e68..007081ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ # Stage 1: Install certs, build binary, create default config file # --- FROM docker.io/golang:1.16 AS builder -RUN mkdir -p /go/src/github.com/anuvu/zot -WORKDIR /go/src/github.com/anuvu/zot +RUN mkdir -p /go/src/github.com/project-zot/zot +WORKDIR /go/src/github.com/project-zot/zot COPY . . RUN make clean binary RUN echo '{\n\ @@ -24,8 +24,8 @@ RUN echo '{\n\ # --- FROM scratch AS final COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /go/src/github.com/anuvu/zot/bin/zot /usr/bin/zot -COPY --from=builder /go/src/github.com/anuvu/zot/config.json /etc/zot/config.json +COPY --from=builder /go/src/github.com/project-zot/zot/bin/zot /usr/bin/zot +COPY --from=builder /go/src/github.com/project-zot/zot/config.json /etc/zot/config.json ENTRYPOINT ["/usr/bin/zot"] EXPOSE 5000 VOLUME ["/var/lib/registry"] diff --git a/Dockerfile-arch b/Dockerfile-arch index b03f9258..17b192bd 100644 --- a/Dockerfile-arch +++ b/Dockerfile-arch @@ -3,8 +3,8 @@ # --- FROM docker.io/golang:1.16 AS builder ARG ARCH -RUN mkdir -p /go/src/github.com/anuvu/zot -WORKDIR /go/src/github.com/anuvu/zot +RUN mkdir -p /go/src/github.com/project-zot/zot +WORKDIR /go/src/github.com/project-zot/zot COPY . . RUN make ARCH=$ARCH clean binary RUN echo '{\n\ @@ -25,8 +25,8 @@ RUN echo '{\n\ # --- FROM scratch AS final COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /go/src/github.com/anuvu/zot/bin/zot /usr/bin/zot -COPY --from=builder /go/src/github.com/anuvu/zot/config.json /etc/zot/config.json +COPY --from=builder /go/src/github.com/project-zot/zot/bin/zot /usr/bin/zot +COPY --from=builder /go/src/github.com/project-zot/zot/config.json /etc/zot/config.json ENTRYPOINT ["/usr/bin/zot"] EXPOSE 5000 VOLUME ["/var/lib/registry"] diff --git a/Dockerfile-arch-minimal b/Dockerfile-arch-minimal index a6d17f68..13b993c2 100644 --- a/Dockerfile-arch-minimal +++ b/Dockerfile-arch-minimal @@ -3,8 +3,8 @@ # --- FROM docker.io/golang:1.16 AS builder ARG ARCH -RUN mkdir -p /go/src/github.com/anuvu/zot -WORKDIR /go/src/github.com/anuvu/zot +RUN mkdir -p /go/src/github.com/project-zot/zot +WORKDIR /go/src/github.com/project-zot/zot COPY . . RUN make ARCH=$ARCH clean binary-minimal RUN echo '{\n\ @@ -25,8 +25,8 @@ RUN echo '{\n\ # --- FROM scratch AS final COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /go/src/github.com/anuvu/zot/bin/zot-minimal /usr/bin/zot -COPY --from=builder /go/src/github.com/anuvu/zot/config.json /etc/zot/config.json +COPY --from=builder /go/src/github.com/project-zot/zot/bin/zot-minimal /usr/bin/zot +COPY --from=builder /go/src/github.com/project-zot/zot/config.json /etc/zot/config.json ENTRYPOINT ["/usr/bin/zot"] EXPOSE 5000 VOLUME ["/var/lib/registry"] diff --git a/Dockerfile-conformance b/Dockerfile-conformance index 37df0009..0b3660a1 100644 --- a/Dockerfile-conformance +++ b/Dockerfile-conformance @@ -3,8 +3,8 @@ # --- FROM docker.io/golang:1.16-alpine AS builder RUN apk --update add git make ca-certificates -RUN mkdir -p /go/src/github.com/anuvu/zot -WORKDIR /go/src/github.com/anuvu/zot +RUN mkdir -p /go/src/github.com/project-zot/zot +WORKDIR /go/src/github.com/project-zot/zot COPY . . RUN make clean binary RUN echo -e '# Default config file for zot server\n\ @@ -21,8 +21,8 @@ storage:\n\ # --- FROM scratch AS final COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /go/src/github.com/anuvu/zot/bin/zot /usr/bin/zot -COPY --from=builder /go/src/github.com/anuvu/zot/config.yml /etc/zot/config.yml +COPY --from=builder /go/src/github.com/project-zot/zot/bin/zot /usr/bin/zot +COPY --from=builder /go/src/github.com/project-zot/zot/config.yml /etc/zot/config.yml ENTRYPOINT ["/usr/bin/zot"] EXPOSE 5000 VOLUME ["/var/lib/registry"] diff --git a/Dockerfile-minimal b/Dockerfile-minimal index eb191517..e0b674f2 100644 --- a/Dockerfile-minimal +++ b/Dockerfile-minimal @@ -2,8 +2,8 @@ # Stage 1: Install certs, build binary, create default config file # --- FROM docker.io/golang:1.16 AS builder -RUN mkdir -p /go/src/github.com/anuvu/zot -WORKDIR /go/src/github.com/anuvu/zot +RUN mkdir -p /go/src/github.com/project-zot/zot +WORKDIR /go/src/github.com/project-zot/zot COPY . . RUN make clean binary-minimal RUN echo '{\n\ @@ -24,8 +24,8 @@ RUN echo '{\n\ # --- FROM scratch AS final COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /go/src/github.com/anuvu/zot/bin/zot-minimal /usr/bin/zot -COPY --from=builder /go/src/github.com/anuvu/zot/config.json /etc/zot/config.json +COPY --from=builder /go/src/github.com/project-zot/zot/bin/zot-minimal /usr/bin/zot +COPY --from=builder /go/src/github.com/project-zot/zot/config.json /etc/zot/config.json ENTRYPOINT ["/usr/bin/zot"] EXPOSE 5000 VOLUME ["/var/lib/registry"] diff --git a/Makefile b/Makefile index 95e996e2..f7fe3676 100644 --- a/Makefile +++ b/Makefile @@ -15,15 +15,15 @@ all: swagger binary binary-minimal exporter-minimal debug test test-clean check .PHONY: binary-minimal binary-minimal: swagger - env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zot-minimal -tags minimal,containers_image_openpgp -v -trimpath -ldflags "-X github.com/anuvu/zot/pkg/api/config.Commit=${COMMIT} -X github.com/anuvu/zot/pkg/api/config.BinaryType=minimal -X github.com/anuvu/zot/pkg/api/config.GoVersion=${GO_VERSION} -s -w" ./cmd/zot + env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zot-minimal -tags minimal,containers_image_openpgp -v -trimpath -ldflags "-X github.com/project-zot/zot/pkg/api/config.Commit=${COMMIT} -X github.com/project-zot/zot/pkg/api/config.BinaryType=minimal -X github.com/project-zot/zot/pkg/api/config.GoVersion=${GO_VERSION} -s -w" ./cmd/zot .PHONY: binary binary: swagger - env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zot -tags extended,containers_image_openpgp -v -trimpath -ldflags "-X github.com/anuvu/zot/pkg/api/config.Commit=${COMMIT} -X github.com/anuvu/zot/pkg/api/config.BinaryType=extended -X github.com/anuvu/zot/pkg/api/config.GoVersion=${GO_VERSION} -s -w" ./cmd/zot + env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zot -tags extended,containers_image_openpgp -v -trimpath -ldflags "-X github.com/project-zot/zot/pkg/api/config.Commit=${COMMIT} -X github.com/project-zot/zot/pkg/api/config.BinaryType=extended -X github.com/project-zot/zot/pkg/api/config.GoVersion=${GO_VERSION} -s -w" ./cmd/zot .PHONY: debug debug: swagger - env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zot-debug -tags extended,containers_image_openpgp -v -gcflags all='-N -l' -ldflags "-X github.com/anuvu/zot/pkg/api/config.Commit=${COMMIT} -X github.com/anuvu/zot/pkg/api/config.BinaryType=extended -X github.com/anuvu/zot/pkg/api/config.GoVersion=${GO_VERSION}" ./cmd/zot + env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zot-debug -tags extended,containers_image_openpgp -v -gcflags all='-N -l' -ldflags "-X github.com/project-zot/zot/pkg/api/config.Commit=${COMMIT} -X github.com/project-zot/zot/pkg/api/config.BinaryType=extended -X github.com/project-zot/zot/pkg/api/config.GoVersion=${GO_VERSION}" ./cmd/zot .PHONY: exporter-minimal exporter-minimal: swagger @@ -79,7 +79,7 @@ binary-container: .PHONY: run-container run-container: - ${CONTAINER_RUNTIME} run --rm --security-opt label=disable -v $$(pwd):/go/src/github.com/anuvu/zot \ + ${CONTAINER_RUNTIME} run --rm --security-opt label=disable -v $$(pwd):/go/src/github.com/project-zot/zot \ zot-build:latest .PHONY: binary-stacker diff --git a/README.md b/README.md index 9b39a338..5b3c67b1 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -# zot [![build-test](https://github.com/anuvu/zot/actions/workflows/ci-cd.yml/badge.svg?branch=main)](https://github.com/anuvu/zot/actions/workflows/ci-cd.yml) [![codecov.io](http://codecov.io/github/anuvu/zot/coverage.svg?branch=main)](http://codecov.io/github/anuvu/zot?branch=main) [![Conformance Results](https://github.com/anuvu/zot/workflows/conformance/badge.svg)](https://github.com/anuvu/zot/actions?query=workflow%3Aconformance) +# zot [![build-test](https://github.com/project-zot/zot/actions/workflows/ci-cd.yml/badge.svg?branch=main)](https://github.com/project-zot/zot/actions/workflows/ci-cd.yml) [![codecov.io](http://codecov.io/github/project-zot/zot/coverage.svg?branch=main)](http://codecov.io/github/project-zot/zot?branch=main) [![Conformance Results](https://github.com/project-zot/zot/workflows/conformance/badge.svg)](https://github.com/project-zot/zot/actions?query=workflow%3Aconformance) **zot** is a vendor-neutral OCI image registry server purely based on [OCI Distribution Specification](https://github.com/opencontainers/distribution-spec). -https://anuvu.github.io/zot/ +https://zotregistry.io -[```docker pull ghcr.io/anuvu/zot:latest```](https://github.com/anuvu/zot/pkgs/container/zot) +[```docker pull ghcr.io/project-zot/zot:latest```](https://github.com/project-zot/zot/pkgs/container/zot) -[```docker run -p 5000:5000 ghcr.io/anuvu/zot:latest```](https://github.com/anuvu/zot/pkgs/container/zot) +[```docker run -p 5000:5000 ghcr.io/project-zot/zot:latest```](https://github.com/project-zot/zot/pkgs/container/zot) [**Why zot?**](COMPARISON.md) @@ -38,13 +38,13 @@ https://anuvu.github.io/zot/ * Automatic garbage collection of orphaned blobs * Layer deduplication using hard links when content is identical * Serve [multiple storage paths (and backends)](./examples/config-multiple.json) using a single zot server -* Pull and synchronize with other zot registries [sync](#sync) +* Pull and synchronize from other dist-spec conformant registries [sync](#sync) * Swagger based documentation * Single binary for _all_ the above features * Released under Apache 2.0 License * [Metrics](#metrics) with Prometheus * Using a node exporter in case of dist-spec-only zot -* ```go get -u github.com/anuvu/zot/cmd/zot``` +* ```go get -u github.com/project-zot/zot/cmd/zot``` # Presentations @@ -53,7 +53,7 @@ https://anuvu.github.io/zot/ # Build and install binary (using host's toolchain) ``` -go get -u github.com/anuvu/zot/cmd/zot +go get -u github.com/project-zot/zot/cmd/zot ``` # Full CI/CD Build @@ -64,7 +64,7 @@ go get -u github.com/anuvu/zot/cmd/zot make binary-container ``` -* Alternatively, build inside a container using [stacker](https://github.com/anuvu/stacker) (preferred) +* Alternatively, build inside a container using [stacker](https://github.com/project-stacker/stacker) (preferred) ``` make binary-stacker diff --git a/cmd/exporter/main.go b/cmd/exporter/main.go index 9f5f16fd..39ff0481 100644 --- a/cmd/exporter/main.go +++ b/cmd/exporter/main.go @@ -1,3 +1,4 @@ +//go:build minimal // +build minimal package main @@ -5,7 +6,7 @@ package main import ( "os" - "github.com/anuvu/zot/pkg/exporter/cli" + "zotregistry.io/zot/pkg/exporter/cli" ) func main() { diff --git a/cmd/zot/main.go b/cmd/zot/main.go index c6b2b8b8..e0f91f71 100644 --- a/cmd/zot/main.go +++ b/cmd/zot/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/anuvu/zot/pkg/cli" + "zotregistry.io/zot/pkg/cli" ) func main() { diff --git a/cmd/zot/main_test.go b/cmd/zot/main_test.go index 7034ce50..1ff1d4c4 100644 --- a/cmd/zot/main_test.go +++ b/cmd/zot/main_test.go @@ -3,10 +3,10 @@ package main_test import ( "testing" - "github.com/anuvu/zot/pkg/api" - "github.com/anuvu/zot/pkg/api/config" - "github.com/anuvu/zot/pkg/cli" . "github.com/smartystreets/goconvey/convey" + "zotregistry.io/zot/pkg/api" + "zotregistry.io/zot/pkg/api/config" + "zotregistry.io/zot/pkg/cli" ) func TestIntegration(t *testing.T) { diff --git a/examples/metrics/Dockerfile b/examples/metrics/Dockerfile index e70fb4e2..13583356 100644 --- a/examples/metrics/Dockerfile +++ b/examples/metrics/Dockerfile @@ -2,10 +2,10 @@ # Stage 1: Install certs, build binary, create default config file # --- FROM docker.io/golang:1.16 AS builder -RUN mkdir -p /go/src/github.com/anuvu/zot -WORKDIR /go/src/github.com/anuvu/zot +RUN mkdir -p /go/src/github.com/project-zot/zot +WORKDIR /go/src/github.com/project-zot/zot COPY . . -RUN CGO_ENABLED=0 make clean binary +RUN make clean binary RUN echo '{\n\ "storage": {\n\ "rootDirectory": "/var/lib/registry"\n\ @@ -32,8 +32,8 @@ RUN echo '{\n\ # --- FROM scratch AS final COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /go/src/github.com/anuvu/zot/bin/zot /zot -COPY --from=builder /go/src/github.com/anuvu/zot/config.json /etc/zot/config.json +COPY --from=builder /go/src/github.com/project-zot/zot/bin/zot /zot +COPY --from=builder /go/src/github.com/project-zot/zot/config.json /etc/zot/config.json ENTRYPOINT ["/zot"] EXPOSE 5000 VOLUME ["/var/lib/registry"] diff --git a/examples/metrics/Dockerfile-exporter b/examples/metrics/Dockerfile-exporter index 464a6b5c..f59de1cc 100644 --- a/examples/metrics/Dockerfile-exporter +++ b/examples/metrics/Dockerfile-exporter @@ -2,10 +2,10 @@ # Stage 1: Install certs, build binary, create default config file # --- FROM docker.io/golang:1.16 AS builder -RUN mkdir -p /go/src/github.com/anuvu/zot -WORKDIR /go/src/github.com/anuvu/zot +RUN mkdir -p /go/src/github.com/project-zot/zot +WORKDIR /go/src/github.com/project-zot/zot COPY . . -RUN CGO_ENABLED=0 make clean exporter-minimal +RUN make clean exporter-minimal RUN echo '{\n\ "Server": {\n\ "protocol": "http",\n\ @@ -24,8 +24,8 @@ RUN echo '{\n\ # Stage 2: Final image with nothing but certs, binary, and default config file # --- FROM scratch AS final -COPY --from=builder /go/src/github.com/anuvu/zot/bin/zot-exporter /zot-exporter -COPY --from=builder /go/src/github.com/anuvu/zot/config.json /etc/zot/config.json +COPY --from=builder /go/src/github.com/project-zot/zot/bin/zot-exporter /zot-exporter +COPY --from=builder /go/src/github.com/project-zot/zot/config.json /etc/zot/config.json ENTRYPOINT ["/zot-exporter"] EXPOSE 5051 VOLUME ["/var/lib/registry"] diff --git a/examples/metrics/Dockerfile-minimal b/examples/metrics/Dockerfile-minimal index 21ce9556..1950d22e 100644 --- a/examples/metrics/Dockerfile-minimal +++ b/examples/metrics/Dockerfile-minimal @@ -2,10 +2,10 @@ # Stage 1: Install certs, build binary, create default config file # --- FROM docker.io/golang:1.16 AS builder -RUN mkdir -p /go/src/github.com/anuvu/zot -WORKDIR /go/src/github.com/anuvu/zot +RUN mkdir -p /go/src/github.com/project-zot/zot +WORKDIR /go/src/github.com/project-zot/zot COPY . . -RUN CGO_ENABLED=0 make clean binary-minimal +RUN make clean binary-minimal RUN echo '{\n\ "storage": {\n\ "rootDirectory": "/var/lib/registry"\n\ @@ -24,8 +24,8 @@ RUN echo '{\n\ # --- FROM scratch AS final COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /go/src/github.com/anuvu/zot/bin/zot-minimal /zot -COPY --from=builder /go/src/github.com/anuvu/zot/config.json /etc/zot/config.json +COPY --from=builder /go/src/github.com/project-zot/zot/bin/zot-minimal /zot +COPY --from=builder /go/src/github.com/project-zot/zot/config.json /etc/zot/config.json ENTRYPOINT ["/zot"] EXPOSE 5050 VOLUME ["/var/lib/registry"] diff --git a/examples/metrics/Makefile b/examples/metrics/Makefile index 5c1c8b54..2de51f51 100644 --- a/examples/metrics/Makefile +++ b/examples/metrics/Makefile @@ -6,7 +6,7 @@ binary-container: .PHONY: run-container run-container: - ${CONTAINER_RUNTIME} run --rm --security-opt label=disable -v $$(pwd)/../..:/go/src/github.com/anuvu/zot \ + ${CONTAINER_RUNTIME} run --rm --security-opt label=disable -v $$(pwd)/../..:/go/src/github.com/project-zot/zot \ zot-build:latest .PHONY: binary-minimal-container @@ -15,7 +15,7 @@ binary-minimal-container: .PHONY: run-minimal-container run-minimal-container: - ${CONTAINER_RUNTIME} run --rm --security-opt label=disable -v $$(pwd)/../..:/go/src/github.com/anuvu/zot \ + ${CONTAINER_RUNTIME} run --rm --security-opt label=disable -v $$(pwd)/../..:/go/src/github.com/project-zot/zot \ zot-minimal:latest .PHONY: binary-exporter-container @@ -24,5 +24,5 @@ binary-exporter-container: .PHONY: run-exporter-container run-exporter-container: - ${CONTAINER_RUNTIME} run --rm --security-opt label=disable -v $$(pwd)/../..:/go/src/github.com/anuvu/zot \ + ${CONTAINER_RUNTIME} run --rm --security-opt label=disable -v $$(pwd)/../..:/go/src/github.com/project-zot/zot \ zot-exporter:latest diff --git a/examples/zot.service b/examples/zot.service index 3705ad12..749b2f02 100644 --- a/examples/zot.service +++ b/examples/zot.service @@ -1,6 +1,6 @@ [Unit] Description=OCI Distribution Registry -Documentation=https://github.com/anuvu/zot +Documentation=https://github.com/project-zot/zot After=network.target auditd.service local-fs.target [Service] diff --git a/go.mod b/go.mod index d46d77ec..42fde44a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/anuvu/zot +module zotregistry.io/zot go 1.16 diff --git a/pkg/api/authn.go b/pkg/api/authn.go index b35c08fd..6a1018e2 100644 --- a/pkg/api/authn.go +++ b/pkg/api/authn.go @@ -12,11 +12,11 @@ import ( "strings" "time" - "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/api/config" "github.com/chartmuseum/auth" "github.com/gorilla/mux" "golang.org/x/crypto/bcrypt" + "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/api/config" ) const ( diff --git a/pkg/api/authz.go b/pkg/api/authz.go index 60134649..5f91c575 100644 --- a/pkg/api/authz.go +++ b/pkg/api/authz.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/anuvu/zot/pkg/api/config" - "github.com/anuvu/zot/pkg/log" "github.com/gorilla/mux" + "zotregistry.io/zot/pkg/api/config" + "zotregistry.io/zot/pkg/log" ) type contextKey int diff --git a/pkg/api/config/config.go b/pkg/api/config/config.go index 0deda88c..cffe0297 100644 --- a/pkg/api/config/config.go +++ b/pkg/api/config/config.go @@ -3,12 +3,12 @@ package config import ( "fmt" - "github.com/anuvu/zot/errors" - extconf "github.com/anuvu/zot/pkg/extensions/config" - "github.com/anuvu/zot/pkg/log" "github.com/getlantern/deepcopy" distspec "github.com/opencontainers/distribution-spec/specs-go" "github.com/spf13/viper" + "zotregistry.io/zot/errors" + extconf "zotregistry.io/zot/pkg/extensions/config" + "zotregistry.io/zot/pkg/log" ) var ( diff --git a/pkg/api/controller.go b/pkg/api/controller.go index 4716a29c..2e752101 100644 --- a/pkg/api/controller.go +++ b/pkg/api/controller.go @@ -9,15 +9,15 @@ import ( "net/http" "time" - "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/api/config" - ext "github.com/anuvu/zot/pkg/extensions" - "github.com/anuvu/zot/pkg/extensions/monitoring" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" - "github.com/anuvu/zot/pkg/storage/s3" "github.com/gorilla/handlers" "github.com/gorilla/mux" + "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/api/config" + ext "zotregistry.io/zot/pkg/extensions" + "zotregistry.io/zot/pkg/extensions/monitoring" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" + "zotregistry.io/zot/pkg/storage/s3" "github.com/docker/distribution/registry/storage/driver/factory" ) diff --git a/pkg/api/controller_test.go b/pkg/api/controller_test.go index 143f5419..146ccfe7 100644 --- a/pkg/api/controller_test.go +++ b/pkg/api/controller_test.go @@ -24,11 +24,6 @@ import ( "testing" "time" - "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/api" - "github.com/anuvu/zot/pkg/api/config" - "github.com/anuvu/zot/pkg/storage" - . "github.com/anuvu/zot/test" "github.com/chartmuseum/auth" "github.com/mitchellh/mapstructure" vldap "github.com/nmcclain/ldap" @@ -44,6 +39,11 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/crypto/bcrypt" "gopkg.in/resty.v1" + "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/api" + "zotregistry.io/zot/pkg/api/config" + "zotregistry.io/zot/pkg/storage" + . "zotregistry.io/zot/test" ) const ( diff --git a/pkg/api/errors.go b/pkg/api/errors.go index ece2dd58..efc2687d 100644 --- a/pkg/api/errors.go +++ b/pkg/api/errors.go @@ -1,7 +1,7 @@ package api import ( - "github.com/anuvu/zot/errors" + "zotregistry.io/zot/errors" ) type Error struct { diff --git a/pkg/api/errors_test.go b/pkg/api/errors_test.go index 83fb2082..26d4b7ca 100644 --- a/pkg/api/errors_test.go +++ b/pkg/api/errors_test.go @@ -3,8 +3,8 @@ package api_test import ( "testing" - "github.com/anuvu/zot/pkg/api" . "github.com/smartystreets/goconvey/convey" + "zotregistry.io/zot/pkg/api" ) func TestUnknownCodeError(t *testing.T) { diff --git a/pkg/api/ldap.go b/pkg/api/ldap.go index 79b5c65d..cb3f9db4 100644 --- a/pkg/api/ldap.go +++ b/pkg/api/ldap.go @@ -10,11 +10,11 @@ import ( "crypto/x509" "fmt" - "github.com/anuvu/zot/errors" goldap "github.com/go-ldap/ldap/v3" + "zotregistry.io/zot/errors" - "github.com/anuvu/zot/pkg/log" "github.com/go-ldap/ldap/v3" + "zotregistry.io/zot/pkg/log" ) type LDAPClient struct { diff --git a/pkg/api/routes.go b/pkg/api/routes.go index 111c3724..e32d34ce 100644 --- a/pkg/api/routes.go +++ b/pkg/api/routes.go @@ -21,17 +21,17 @@ import ( "strconv" "strings" - "github.com/anuvu/zot/errors" - ext "github.com/anuvu/zot/pkg/extensions" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" - _ "github.com/anuvu/zot/swagger" // as required by swaggo "github.com/gorilla/mux" jsoniter "github.com/json-iterator/go" "github.com/notaryproject/notation-go-lib" notreg "github.com/notaryproject/notation/pkg/registry" ispec "github.com/opencontainers/image-spec/specs-go/v1" httpSwagger "github.com/swaggo/http-swagger" + "zotregistry.io/zot/errors" + ext "zotregistry.io/zot/pkg/extensions" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" + _ "zotregistry.io/zot/swagger" // as required by swaggo ) const ( diff --git a/pkg/api/session.go b/pkg/api/session.go index 5885dd82..11be1ac4 100644 --- a/pkg/api/session.go +++ b/pkg/api/session.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/anuvu/zot/pkg/extensions/monitoring" - "github.com/anuvu/zot/pkg/log" "github.com/gorilla/mux" + "zotregistry.io/zot/pkg/extensions/monitoring" + "zotregistry.io/zot/pkg/log" ) type statusWriter struct { diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go index e31da33e..1ed23284 100644 --- a/pkg/cli/cli.go +++ b/pkg/cli/cli.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package cli diff --git a/pkg/cli/client.go b/pkg/cli/client.go index 730d7ec9..5b511b6e 100644 --- a/pkg/cli/client.go +++ b/pkg/cli/client.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package cli @@ -18,8 +19,8 @@ import ( "sync" "time" - zotErrors "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/storage" + zotErrors "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/storage" ) var httpClientsMap = make(map[string]*http.Client) //nolint: gochecknoglobals diff --git a/pkg/cli/client_test.go b/pkg/cli/client_test.go index 5e924ef5..1e4a6a22 100644 --- a/pkg/cli/client_test.go +++ b/pkg/cli/client_test.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package cli //nolint:testpackage @@ -14,11 +15,11 @@ import ( "testing" "time" - "github.com/anuvu/zot/pkg/api" - "github.com/anuvu/zot/pkg/api/config" - . "github.com/anuvu/zot/test" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" + "zotregistry.io/zot/pkg/api" + "zotregistry.io/zot/pkg/api/config" + . "zotregistry.io/zot/test" ) const ( diff --git a/pkg/cli/config_cmd.go b/pkg/cli/config_cmd.go index 3383692f..386e5cb4 100644 --- a/pkg/cli/config_cmd.go +++ b/pkg/cli/config_cmd.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package cli @@ -14,7 +15,7 @@ import ( jsoniter "github.com/json-iterator/go" - zotErrors "github.com/anuvu/zot/errors" + zotErrors "zotregistry.io/zot/errors" "github.com/spf13/cobra" ) diff --git a/pkg/cli/config_cmd_test.go b/pkg/cli/config_cmd_test.go index a2e9e94d..b9073ac2 100644 --- a/pkg/cli/config_cmd_test.go +++ b/pkg/cli/config_cmd_test.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package cli //nolint:testpackage @@ -10,7 +11,7 @@ import ( "strings" "testing" - zotErrors "github.com/anuvu/zot/errors" + zotErrors "zotregistry.io/zot/errors" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/cli/cve_cmd.go b/pkg/cli/cve_cmd.go index 8f464220..51f33499 100644 --- a/pkg/cli/cve_cmd.go +++ b/pkg/cli/cve_cmd.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package cli @@ -7,7 +8,7 @@ import ( "os" "path" - zotErrors "github.com/anuvu/zot/errors" + zotErrors "zotregistry.io/zot/errors" "github.com/briandowns/spinner" "github.com/spf13/cobra" diff --git a/pkg/cli/cve_cmd_test.go b/pkg/cli/cve_cmd_test.go index dec720b1..6a79cbff 100644 --- a/pkg/cli/cve_cmd_test.go +++ b/pkg/cli/cve_cmd_test.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package cli //nolint:testpackage @@ -14,13 +15,13 @@ import ( "testing" "time" - zotErrors "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/api" - "github.com/anuvu/zot/pkg/api/config" - extconf "github.com/anuvu/zot/pkg/extensions/config" - . "github.com/anuvu/zot/test" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" + zotErrors "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/api" + "zotregistry.io/zot/pkg/api/config" + extconf "zotregistry.io/zot/pkg/extensions/config" + . "zotregistry.io/zot/test" ) func TestSearchCVECmd(t *testing.T) { diff --git a/pkg/cli/image_cmd.go b/pkg/cli/image_cmd.go index 92a6c328..8dd0dde1 100644 --- a/pkg/cli/image_cmd.go +++ b/pkg/cli/image_cmd.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package cli @@ -8,9 +9,9 @@ import ( "strconv" "time" - zotErrors "github.com/anuvu/zot/errors" "github.com/briandowns/spinner" "github.com/spf13/cobra" + zotErrors "zotregistry.io/zot/errors" ) func NewImageCommand(searchService SearchService) *cobra.Command { diff --git a/pkg/cli/image_cmd_test.go b/pkg/cli/image_cmd_test.go index 29894eb3..40cdc99d 100644 --- a/pkg/cli/image_cmd_test.go +++ b/pkg/cli/image_cmd_test.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package cli //nolint:testpackage @@ -16,15 +17,15 @@ import ( "testing" "time" - zotErrors "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/api" - "github.com/anuvu/zot/pkg/api/config" - extconf "github.com/anuvu/zot/pkg/extensions/config" - . "github.com/anuvu/zot/test" godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" + zotErrors "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/api" + "zotregistry.io/zot/pkg/api/config" + extconf "zotregistry.io/zot/pkg/extensions/config" + . "zotregistry.io/zot/test" ) func TestSearchImageCmd(t *testing.T) { diff --git a/pkg/cli/minimal.go b/pkg/cli/minimal.go index 23292cf4..710992d2 100644 --- a/pkg/cli/minimal.go +++ b/pkg/cli/minimal.go @@ -1,3 +1,4 @@ +//go:build minimal // +build minimal package cli diff --git a/pkg/cli/root.go b/pkg/cli/root.go index 16a9f3aa..c06e7daa 100644 --- a/pkg/cli/root.go +++ b/pkg/cli/root.go @@ -1,10 +1,6 @@ package cli import ( - "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/api" - "github.com/anuvu/zot/pkg/api/config" - "github.com/anuvu/zot/pkg/storage" glob "github.com/bmatcuk/doublestar/v4" "github.com/fsnotify/fsnotify" "github.com/mitchellh/mapstructure" @@ -12,6 +8,10 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" + "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/api" + "zotregistry.io/zot/pkg/api/config" + "zotregistry.io/zot/pkg/storage" ) // metadataConfig reports metadata after parsing, which we use to track diff --git a/pkg/cli/root_test.go b/pkg/cli/root_test.go index abe253c3..77a1c2f6 100644 --- a/pkg/cli/root_test.go +++ b/pkg/cli/root_test.go @@ -6,10 +6,10 @@ import ( "path" "testing" - "github.com/anuvu/zot/pkg/api/config" - "github.com/anuvu/zot/pkg/cli" . "github.com/smartystreets/goconvey/convey" "github.com/spf13/viper" + "zotregistry.io/zot/pkg/api/config" + "zotregistry.io/zot/pkg/cli" ) func TestUsage(t *testing.T) { diff --git a/pkg/cli/searcher.go b/pkg/cli/searcher.go index f3f260c8..2134ce21 100644 --- a/pkg/cli/searcher.go +++ b/pkg/cli/searcher.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package cli @@ -11,8 +12,8 @@ import ( "sync" "time" - zotErrors "github.com/anuvu/zot/errors" "github.com/briandowns/spinner" + zotErrors "zotregistry.io/zot/errors" ) func getImageSearchers() []searcher { diff --git a/pkg/cli/service.go b/pkg/cli/service.go index c0ce47da..eeab8902 100644 --- a/pkg/cli/service.go +++ b/pkg/cli/service.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package cli @@ -17,7 +18,7 @@ import ( "github.com/olekukonko/tablewriter" "gopkg.in/yaml.v2" - zotErrors "github.com/anuvu/zot/errors" + zotErrors "zotregistry.io/zot/errors" ) type SearchService interface { diff --git a/pkg/compliance/v1_0_0/check.go b/pkg/compliance/v1_0_0/check.go index 23275034..bca02803 100644 --- a/pkg/compliance/v1_0_0/check.go +++ b/pkg/compliance/v1_0_0/check.go @@ -11,14 +11,14 @@ import ( "strings" "testing" - "github.com/anuvu/zot/pkg/api" - "github.com/anuvu/zot/pkg/compliance" - . "github.com/anuvu/zot/test" // nolint:golint,stylecheck godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" // nolint:golint,stylecheck "github.com/smartystreets/goconvey/convey/reporting" "gopkg.in/resty.v1" + "zotregistry.io/zot/pkg/api" + "zotregistry.io/zot/pkg/compliance" + . "zotregistry.io/zot/test" // nolint:golint,stylecheck ) func CheckWorkflows(t *testing.T, config *compliance.Config) { diff --git a/pkg/compliance/v1_0_0/check_test.go b/pkg/compliance/v1_0_0/check_test.go index b2a6b283..7521aaf9 100644 --- a/pkg/compliance/v1_0_0/check_test.go +++ b/pkg/compliance/v1_0_0/check_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "github.com/anuvu/zot/pkg/api" - "github.com/anuvu/zot/pkg/api/config" - "github.com/anuvu/zot/pkg/compliance" - "github.com/anuvu/zot/pkg/compliance/v1_0_0" - . "github.com/anuvu/zot/test" "gopkg.in/resty.v1" + "zotregistry.io/zot/pkg/api" + "zotregistry.io/zot/pkg/api/config" + "zotregistry.io/zot/pkg/compliance" + "zotregistry.io/zot/pkg/compliance/v1_0_0" + . "zotregistry.io/zot/test" ) // nolint: gochecknoglobals diff --git a/pkg/exporter/api/config.go b/pkg/exporter/api/config.go index 8ad36316..a02a8bf1 100644 --- a/pkg/exporter/api/config.go +++ b/pkg/exporter/api/config.go @@ -1,3 +1,4 @@ +//go:build minimal // +build minimal package api diff --git a/pkg/exporter/api/controller.go b/pkg/exporter/api/controller.go index 54d81d5a..7919f99b 100644 --- a/pkg/exporter/api/controller.go +++ b/pkg/exporter/api/controller.go @@ -1,9 +1,10 @@ +//go:build minimal // +build minimal package api import ( - "github.com/anuvu/zot/pkg/log" + "zotregistry.io/zot/pkg/log" ) type Controller struct { diff --git a/pkg/exporter/api/controller_test.go b/pkg/exporter/api/controller_test.go index 5229c50a..cae43daa 100644 --- a/pkg/exporter/api/controller_test.go +++ b/pkg/exporter/api/controller_test.go @@ -1,3 +1,4 @@ +//go:build minimal // +build minimal package api_test @@ -15,16 +16,16 @@ import ( "testing" "time" - zotapi "github.com/anuvu/zot/pkg/api" - zotcfg "github.com/anuvu/zot/pkg/api/config" - "github.com/anuvu/zot/pkg/exporter/api" - "github.com/anuvu/zot/pkg/extensions/monitoring" - . "github.com/anuvu/zot/test" jsoniter "github.com/json-iterator/go" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" + zotapi "zotregistry.io/zot/pkg/api" + zotcfg "zotregistry.io/zot/pkg/api/config" + "zotregistry.io/zot/pkg/exporter/api" + "zotregistry.io/zot/pkg/extensions/monitoring" + . "zotregistry.io/zot/test" ) const ( diff --git a/pkg/exporter/api/exporter.go b/pkg/exporter/api/exporter.go index d7f6acc1..7ddbd9b0 100644 --- a/pkg/exporter/api/exporter.go +++ b/pkg/exporter/api/exporter.go @@ -1,3 +1,4 @@ +//go:build minimal // +build minimal package api @@ -9,10 +10,10 @@ import ( "regexp" "strconv" - "github.com/anuvu/zot/pkg/extensions/monitoring" - "github.com/anuvu/zot/pkg/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" + "zotregistry.io/zot/pkg/extensions/monitoring" + "zotregistry.io/zot/pkg/log" ) type Collector struct { diff --git a/pkg/exporter/cli/cli.go b/pkg/exporter/cli/cli.go index 57709858..832e3a58 100644 --- a/pkg/exporter/cli/cli.go +++ b/pkg/exporter/cli/cli.go @@ -1,10 +1,11 @@ +//go:build minimal // +build minimal package cli import ( - "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/exporter/api" + "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/exporter/api" "github.com/mitchellh/mapstructure" "github.com/rs/zerolog/log" diff --git a/pkg/extensions/config/config.go b/pkg/extensions/config/config.go index 77f2d767..47700b80 100644 --- a/pkg/extensions/config/config.go +++ b/pkg/extensions/config/config.go @@ -3,7 +3,7 @@ package config import ( "time" - "github.com/anuvu/zot/pkg/extensions/sync" + "zotregistry.io/zot/pkg/extensions/sync" ) type ExtensionConfig struct { diff --git a/pkg/extensions/extensions.go b/pkg/extensions/extensions.go index 666946a9..f42509dd 100644 --- a/pkg/extensions/extensions.go +++ b/pkg/extensions/extensions.go @@ -7,14 +7,14 @@ import ( "time" gqlHandler "github.com/99designs/gqlgen/graphql/handler" - "github.com/anuvu/zot/pkg/api/config" - "github.com/anuvu/zot/pkg/extensions/search" - cveinfo "github.com/anuvu/zot/pkg/extensions/search/cve" - "github.com/anuvu/zot/pkg/extensions/sync" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" "github.com/gorilla/mux" "github.com/prometheus/client_golang/prometheus/promhttp" + "zotregistry.io/zot/pkg/api/config" + "zotregistry.io/zot/pkg/extensions/search" + cveinfo "zotregistry.io/zot/pkg/extensions/search/cve" + "zotregistry.io/zot/pkg/extensions/sync" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" ) // DownloadTrivyDB ... diff --git a/pkg/extensions/minimal.go b/pkg/extensions/minimal.go index 89c778ae..1d3238fb 100644 --- a/pkg/extensions/minimal.go +++ b/pkg/extensions/minimal.go @@ -1,3 +1,4 @@ +//go:build minimal // +build minimal package extensions @@ -5,10 +6,10 @@ package extensions import ( "time" - "github.com/anuvu/zot/pkg/api/config" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" "github.com/gorilla/mux" + "zotregistry.io/zot/pkg/api/config" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" ) // nolint: deadcode,unused diff --git a/pkg/extensions/monitoring/extension.go b/pkg/extensions/monitoring/extension.go index 25638783..e16ba570 100644 --- a/pkg/extensions/monitoring/extension.go +++ b/pkg/extensions/monitoring/extension.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package monitoring @@ -7,9 +8,9 @@ import ( "regexp" "time" - "github.com/anuvu/zot/pkg/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" + "zotregistry.io/zot/pkg/log" ) const metricsNamespace = "zot" diff --git a/pkg/extensions/monitoring/minimal.go b/pkg/extensions/monitoring/minimal.go index 203f05fd..92210552 100644 --- a/pkg/extensions/monitoring/minimal.go +++ b/pkg/extensions/monitoring/minimal.go @@ -1,3 +1,4 @@ +//go:build minimal // +build minimal package monitoring @@ -10,7 +11,7 @@ import ( "strconv" "time" - "github.com/anuvu/zot/pkg/log" + "zotregistry.io/zot/pkg/log" ) const ( diff --git a/pkg/extensions/monitoring/minimal_client.go b/pkg/extensions/monitoring/minimal_client.go index e7cc6ced..8c5d55d0 100644 --- a/pkg/extensions/monitoring/minimal_client.go +++ b/pkg/extensions/monitoring/minimal_client.go @@ -1,3 +1,4 @@ +//go:build minimal // +build minimal package monitoring @@ -8,7 +9,7 @@ import ( "net/http" "time" - "github.com/anuvu/zot/pkg/log" + "zotregistry.io/zot/pkg/log" ) const ( diff --git a/pkg/extensions/search/common/common.go b/pkg/extensions/search/common/common.go index 6a1cd478..65688c17 100644 --- a/pkg/extensions/search/common/common.go +++ b/pkg/extensions/search/common/common.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/anuvu/zot/pkg/storage" ispec "github.com/opencontainers/image-spec/specs-go/v1" + "zotregistry.io/zot/pkg/storage" ) const ( diff --git a/pkg/extensions/search/common/common_test.go b/pkg/extensions/search/common/common_test.go index e4bbf2ef..333cd429 100644 --- a/pkg/extensions/search/common/common_test.go +++ b/pkg/extensions/search/common/common_test.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package common_test @@ -11,17 +12,17 @@ import ( "testing" "time" - "github.com/anuvu/zot/pkg/api" - "github.com/anuvu/zot/pkg/api/config" - extconf "github.com/anuvu/zot/pkg/extensions/config" - "github.com/anuvu/zot/pkg/extensions/monitoring" - "github.com/anuvu/zot/pkg/extensions/search/common" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" - . "github.com/anuvu/zot/test" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" + "zotregistry.io/zot/pkg/api" + "zotregistry.io/zot/pkg/api/config" + extconf "zotregistry.io/zot/pkg/extensions/config" + "zotregistry.io/zot/pkg/extensions/monitoring" + "zotregistry.io/zot/pkg/extensions/search/common" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" + . "zotregistry.io/zot/test" ) // nolint:gochecknoglobals diff --git a/pkg/extensions/search/common/oci_layout.go b/pkg/extensions/search/common/oci_layout.go index f3ac827e..17c5aef1 100644 --- a/pkg/extensions/search/common/oci_layout.go +++ b/pkg/extensions/search/common/oci_layout.go @@ -9,13 +9,13 @@ import ( goerrors "errors" - "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/types" godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" + "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" ) // OciLayoutInfo ... diff --git a/pkg/extensions/search/cve/cve.go b/pkg/extensions/search/cve/cve.go index ffe308b5..f72d2892 100644 --- a/pkg/extensions/search/cve/cve.go +++ b/pkg/extensions/search/cve/cve.go @@ -6,15 +6,15 @@ import ( "path" "strings" - "github.com/anuvu/zot/pkg/extensions/search/common" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" dbTypes "github.com/aquasecurity/trivy-db/pkg/types" "github.com/aquasecurity/trivy/pkg/commands/artifact" "github.com/aquasecurity/trivy/pkg/commands/operation" "github.com/aquasecurity/trivy/pkg/report" "github.com/aquasecurity/trivy/pkg/types" "github.com/urfave/cli/v2" + "zotregistry.io/zot/pkg/extensions/search/common" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" ) func getRoutePrefix(name string) string { diff --git a/pkg/extensions/search/cve/cve_test.go b/pkg/extensions/search/cve/cve_test.go index 85deef13..1e531a0f 100644 --- a/pkg/extensions/search/cve/cve_test.go +++ b/pkg/extensions/search/cve/cve_test.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended // nolint: lll @@ -13,18 +14,18 @@ import ( "testing" "time" - "github.com/anuvu/zot/pkg/api" - "github.com/anuvu/zot/pkg/api/config" - extconf "github.com/anuvu/zot/pkg/extensions/config" - "github.com/anuvu/zot/pkg/extensions/monitoring" - "github.com/anuvu/zot/pkg/extensions/search/common" - cveinfo "github.com/anuvu/zot/pkg/extensions/search/cve" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" - . "github.com/anuvu/zot/test" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" + "zotregistry.io/zot/pkg/api" + "zotregistry.io/zot/pkg/api/config" + extconf "zotregistry.io/zot/pkg/extensions/config" + "zotregistry.io/zot/pkg/extensions/monitoring" + "zotregistry.io/zot/pkg/extensions/search/common" + cveinfo "zotregistry.io/zot/pkg/extensions/search/cve" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" + . "zotregistry.io/zot/test" ) // nolint:gochecknoglobals diff --git a/pkg/extensions/search/cve/models.go b/pkg/extensions/search/cve/models.go index bffb5cab..08c45dc6 100644 --- a/pkg/extensions/search/cve/models.go +++ b/pkg/extensions/search/cve/models.go @@ -2,10 +2,10 @@ package cveinfo import ( - "github.com/anuvu/zot/pkg/extensions/search/common" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" "github.com/urfave/cli/v2" + "zotregistry.io/zot/pkg/extensions/search/common" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" ) // CveInfo ... diff --git a/pkg/extensions/search/digest/digest.go b/pkg/extensions/search/digest/digest.go index 3cc96925..58107bac 100644 --- a/pkg/extensions/search/digest/digest.go +++ b/pkg/extensions/search/digest/digest.go @@ -3,10 +3,10 @@ package digestinfo import ( "strings" - "github.com/anuvu/zot/pkg/extensions/search/common" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" ispec "github.com/opencontainers/image-spec/specs-go/v1" + "zotregistry.io/zot/pkg/extensions/search/common" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" ) // DigestInfo implements searching by manifes/config/layer digest. diff --git a/pkg/extensions/search/digest/digest_test.go b/pkg/extensions/search/digest/digest_test.go index 7543faf0..d717e674 100644 --- a/pkg/extensions/search/digest/digest_test.go +++ b/pkg/extensions/search/digest/digest_test.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended // nolint: gochecknoinits @@ -11,16 +12,16 @@ import ( "testing" "time" - "github.com/anuvu/zot/pkg/api" - "github.com/anuvu/zot/pkg/api/config" - extconf "github.com/anuvu/zot/pkg/extensions/config" - "github.com/anuvu/zot/pkg/extensions/monitoring" - digestinfo "github.com/anuvu/zot/pkg/extensions/search/digest" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" - . "github.com/anuvu/zot/test" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" + "zotregistry.io/zot/pkg/api" + "zotregistry.io/zot/pkg/api/config" + extconf "zotregistry.io/zot/pkg/extensions/config" + "zotregistry.io/zot/pkg/extensions/monitoring" + digestinfo "zotregistry.io/zot/pkg/extensions/search/digest" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" + . "zotregistry.io/zot/test" ) // nolint:gochecknoglobals diff --git a/pkg/extensions/search/resolver.go b/pkg/extensions/search/resolver.go index 1de058e7..6e884909 100644 --- a/pkg/extensions/search/resolver.go +++ b/pkg/extensions/search/resolver.go @@ -8,13 +8,13 @@ import ( "strconv" "strings" - "github.com/anuvu/zot/pkg/log" godigest "github.com/opencontainers/go-digest" + "zotregistry.io/zot/pkg/log" - "github.com/anuvu/zot/pkg/extensions/search/common" - cveinfo "github.com/anuvu/zot/pkg/extensions/search/cve" - digestinfo "github.com/anuvu/zot/pkg/extensions/search/digest" - "github.com/anuvu/zot/pkg/storage" + "zotregistry.io/zot/pkg/extensions/search/common" + cveinfo "zotregistry.io/zot/pkg/extensions/search/cve" + digestinfo "zotregistry.io/zot/pkg/extensions/search/digest" + "zotregistry.io/zot/pkg/storage" ) // THIS CODE IS A STARTING POINT ONLY. IT WILL NOT BE UPDATED WITH SCHEMA CHANGES. // Resolver ... diff --git a/pkg/extensions/sync/http_handler.go b/pkg/extensions/sync/http_handler.go index 08bda90d..6d1b01f7 100644 --- a/pkg/extensions/sync/http_handler.go +++ b/pkg/extensions/sync/http_handler.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" guuid "github.com/gofrs/uuid" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" ) type PostHandler struct { diff --git a/pkg/extensions/sync/on_demand.go b/pkg/extensions/sync/on_demand.go index e4ad0d1d..22932a4c 100644 --- a/pkg/extensions/sync/on_demand.go +++ b/pkg/extensions/sync/on_demand.go @@ -7,14 +7,14 @@ import ( "path" "strings" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" "github.com/containers/common/pkg/retry" "github.com/containers/image/v5/copy" "github.com/containers/image/v5/docker" "github.com/containers/image/v5/docker/reference" "github.com/containers/image/v5/oci/layout" guuid "github.com/gofrs/uuid" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" ) func OneImage(cfg Config, log log.Logger, diff --git a/pkg/extensions/sync/sync.go b/pkg/extensions/sync/sync.go index 86a12a2f..2c0d6c2d 100644 --- a/pkg/extensions/sync/sync.go +++ b/pkg/extensions/sync/sync.go @@ -15,9 +15,6 @@ import ( "time" "github.com/Masterminds/semver" - "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" "github.com/containers/common/pkg/retry" "github.com/containers/image/v5/copy" "github.com/containers/image/v5/docker" @@ -28,6 +25,9 @@ import ( guuid "github.com/gofrs/uuid" ispec "github.com/opencontainers/image-spec/specs-go/v1" "gopkg.in/resty.v1" + "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" ) const ( diff --git a/pkg/extensions/sync/sync_internal_test.go b/pkg/extensions/sync/sync_internal_test.go index 9343e2cc..a8ac13b9 100644 --- a/pkg/extensions/sync/sync_internal_test.go +++ b/pkg/extensions/sync/sync_internal_test.go @@ -10,11 +10,6 @@ import ( "testing" "time" - "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/extensions/monitoring" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" - . "github.com/anuvu/zot/test" "github.com/containers/image/v5/docker" "github.com/containers/image/v5/docker/reference" "github.com/containers/image/v5/types" @@ -22,6 +17,11 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/rs/zerolog" . "github.com/smartystreets/goconvey/convey" + "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/extensions/monitoring" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" + . "zotregistry.io/zot/test" ) const ( diff --git a/pkg/extensions/sync/sync_test.go b/pkg/extensions/sync/sync_test.go index 2c633a81..0bea8d14 100644 --- a/pkg/extensions/sync/sync_test.go +++ b/pkg/extensions/sync/sync_test.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package sync_test @@ -18,14 +19,14 @@ import ( "testing" "time" - "github.com/anuvu/zot/pkg/api" - "github.com/anuvu/zot/pkg/api/config" - extconf "github.com/anuvu/zot/pkg/extensions/config" - "github.com/anuvu/zot/pkg/extensions/sync" - . "github.com/anuvu/zot/test" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" + "zotregistry.io/zot/pkg/api" + "zotregistry.io/zot/pkg/api/config" + extconf "zotregistry.io/zot/pkg/extensions/config" + "zotregistry.io/zot/pkg/extensions/sync" + . "zotregistry.io/zot/test" ) const ( diff --git a/pkg/extensions/sync/utils.go b/pkg/extensions/sync/utils.go index b8378edd..676889d7 100644 --- a/pkg/extensions/sync/utils.go +++ b/pkg/extensions/sync/utils.go @@ -7,14 +7,14 @@ import ( "path" "strings" - "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/extensions/monitoring" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" glob "github.com/bmatcuk/doublestar/v4" "github.com/containers/image/v5/docker/reference" "github.com/containers/image/v5/types" ispec "github.com/opencontainers/image-spec/specs-go/v1" + "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/extensions/monitoring" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" ) // getTagFromRef returns a tagged reference from an image reference. diff --git a/pkg/log/log_test.go b/pkg/log/log_test.go index f98460d5..0a3fa737 100644 --- a/pkg/log/log_test.go +++ b/pkg/log/log_test.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package log_test @@ -14,12 +15,12 @@ import ( "testing" "time" - "github.com/anuvu/zot/pkg/api" - "github.com/anuvu/zot/pkg/api/config" - . "github.com/anuvu/zot/test" godigest "github.com/opencontainers/go-digest" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" + "zotregistry.io/zot/pkg/api" + "zotregistry.io/zot/pkg/api/config" + . "zotregistry.io/zot/test" ) const ( diff --git a/pkg/storage/cache.go b/pkg/storage/cache.go index 5063c19d..bbed9b26 100644 --- a/pkg/storage/cache.go +++ b/pkg/storage/cache.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/anuvu/zot/errors" - zlog "github.com/anuvu/zot/pkg/log" "go.etcd.io/bbolt" + "zotregistry.io/zot/errors" + zlog "zotregistry.io/zot/pkg/log" ) const ( diff --git a/pkg/storage/cache_test.go b/pkg/storage/cache_test.go index 82c54989..5dca96b7 100644 --- a/pkg/storage/cache_test.go +++ b/pkg/storage/cache_test.go @@ -6,10 +6,10 @@ import ( "path" "testing" - "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" . "github.com/smartystreets/goconvey/convey" + "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" ) func TestCache(t *testing.T) { diff --git a/pkg/storage/s3/s3_test.go b/pkg/storage/s3/s3_test.go index 3b8635e4..c6901440 100644 --- a/pkg/storage/s3/s3_test.go +++ b/pkg/storage/s3/s3_test.go @@ -18,14 +18,14 @@ import ( "testing" - zerr "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/extensions/monitoring" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" - "github.com/anuvu/zot/pkg/storage/s3" guuid "github.com/gofrs/uuid" "github.com/rs/zerolog" . "github.com/smartystreets/goconvey/convey" + zerr "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/extensions/monitoring" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" + "zotregistry.io/zot/pkg/storage/s3" // Add s3 support storageDriver "github.com/docker/distribution/registry/storage/driver" diff --git a/pkg/storage/s3/storage.go b/pkg/storage/s3/storage.go index 965bb3da..dffce775 100644 --- a/pkg/storage/s3/storage.go +++ b/pkg/storage/s3/storage.go @@ -12,15 +12,15 @@ import ( "strings" "sync" - "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/extensions/monitoring" - zlog "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" guuid "github.com/gofrs/uuid" "github.com/notaryproject/notation-go-lib" godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/rs/zerolog" + "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/extensions/monitoring" + zlog "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" // Add s3 support storageDriver "github.com/docker/distribution/registry/storage/driver" diff --git a/pkg/storage/storage_fs.go b/pkg/storage/storage_fs.go index 67c0fb9f..ffaba7a2 100644 --- a/pkg/storage/storage_fs.go +++ b/pkg/storage/storage_fs.go @@ -17,9 +17,6 @@ import ( artifactspec "github.com/oras-project/artifacts-spec/specs-go/v1" - "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/extensions/monitoring" - zlog "github.com/anuvu/zot/pkg/log" apexlog "github.com/apex/log" guuid "github.com/gofrs/uuid" "github.com/notaryproject/notation-go-lib" @@ -28,6 +25,9 @@ import ( "github.com/opencontainers/umoci" "github.com/opencontainers/umoci/oci/casext" "github.com/rs/zerolog" + "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/extensions/monitoring" + zlog "zotregistry.io/zot/pkg/log" ) const ( diff --git a/pkg/storage/storage_fs_test.go b/pkg/storage/storage_fs_test.go index 1a22f5b7..3de95962 100644 --- a/pkg/storage/storage_fs_test.go +++ b/pkg/storage/storage_fs_test.go @@ -13,14 +13,14 @@ import ( "testing" "time" - "github.com/anuvu/zot/errors" - "github.com/anuvu/zot/pkg/extensions/monitoring" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/rs/zerolog" . "github.com/smartystreets/goconvey/convey" + "zotregistry.io/zot/errors" + "zotregistry.io/zot/pkg/extensions/monitoring" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" ) func TestStorageFSAPIs(t *testing.T) { diff --git a/pkg/storage/storage_test.go b/pkg/storage/storage_test.go index 2a19b3a6..ea5f12f7 100644 --- a/pkg/storage/storage_test.go +++ b/pkg/storage/storage_test.go @@ -15,16 +15,16 @@ import ( //"strings" "testing" - "github.com/anuvu/zot/pkg/extensions/monitoring" - "github.com/anuvu/zot/pkg/log" - "github.com/anuvu/zot/pkg/storage" - "github.com/anuvu/zot/pkg/storage/s3" guuid "github.com/gofrs/uuid" godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/rs/zerolog" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" + "zotregistry.io/zot/pkg/extensions/monitoring" + "zotregistry.io/zot/pkg/log" + "zotregistry.io/zot/pkg/storage" + "zotregistry.io/zot/pkg/storage/s3" // Add s3 support "github.com/docker/distribution/registry/storage/driver" diff --git a/stacker.yaml b/stacker.yaml index a027b3b9..dbaf6634 100644 --- a/stacker.yaml +++ b/stacker.yaml @@ -10,10 +10,10 @@ build: export HOME='/root' export PATH='/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' go get -u github.com/swaggo/swag/cmd/swag - mkdir -p /go/src/github.com/anuvu - cd /go/src/github.com/anuvu + mkdir -p /go/src/github.com/project-zot + cd /go/src/github.com/project-zot git clone /zotcopy zot - cd /go/src/github.com/anuvu/zot + cd /go/src/github.com/project-zot/zot make binary build_only: true diff --git a/swagger/docs_test.go b/swagger/docs_test.go index 0264c274..4ce414a6 100644 --- a/swagger/docs_test.go +++ b/swagger/docs_test.go @@ -3,8 +3,8 @@ package swagger_test import ( "testing" - "github.com/anuvu/zot/swagger" . "github.com/smartystreets/goconvey/convey" + "zotregistry.io/zot/swagger" ) func TestDocs(t *testing.T) { diff --git a/test/common_test.go b/test/common_test.go index b6850763..e1216b83 100644 --- a/test/common_test.go +++ b/test/common_test.go @@ -1,3 +1,4 @@ +//go:build extended // +build extended package test_test @@ -8,8 +9,8 @@ import ( "path" "testing" - . "github.com/anuvu/zot/test" . "github.com/smartystreets/goconvey/convey" + . "zotregistry.io/zot/test" ) func TestCopyFiles(t *testing.T) {