alt/zot-wo-auth
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move references to zotregistry.io and project-zot

Browse Source 
Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com>
This commit is contained in:
Ramkumar Chinchani 2021-12-04 03:50:58 +00:00 committed by Ravi Chamarthy
parent 304a68334e
commit 96226af869
83 changed files with 288 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci-cd.yml vendored
View File

@ -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:

4
.github/workflows/oci-conformance-action.yml vendored
View File

@ -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:

11
COMPARISON.md
View File

@ -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

12
CONTRIBUTING.md
View File

@ -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

8
Dockerfile
View File

@ -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"]

8
Dockerfile-arch
View File

@ -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"]

8
Dockerfile-arch-minimal
View File

@ -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"]

8
Dockerfile-conformance
View File

@ -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"]

8
Dockerfile-minimal
View File

@ -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"]

8
Makefile
View File

@ -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

16
README.md
View File

@ -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

3
cmd/exporter/main.go
View File

@ -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() {

2
cmd/zot/main.go
View File

@ -3,7 +3,7 @@ package main
import (
"os"
"github.com/anuvu/zot/pkg/cli"
"zotregistry.io/zot/pkg/cli"
)
func main() {

6
cmd/zot/main_test.go
View File

@ -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) {

10
examples/metrics/Dockerfile
View File

@ -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"]

10
examples/metrics/Dockerfile-exporter
View File

@ -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"]

10
examples/metrics/Dockerfile-minimal
View File

@ -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"]

6
examples/metrics/Makefile
View File

@ -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

2
examples/zot.service
View File

@ -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]

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/anuvu/zot
module zotregistry.io/zot
go 1.16

4
pkg/api/authn.go
View File

@ -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 (

4
pkg/api/authz.go
View File

@ -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

6
pkg/api/config/config.go
View File

@ -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 (

14
pkg/api/controller.go
View File

@ -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"
)

10
pkg/api/controller_test.go
View File

@ -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 (

2
pkg/api/errors.go
View File

@ -1,7 +1,7 @@
package api
import (
"github.com/anuvu/zot/errors"
"zotregistry.io/zot/errors"
)
type Error struct {

2
pkg/api/errors_test.go
View File

@ -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) {

4
pkg/api/ldap.go
View File

@ -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 {

10
pkg/api/routes.go
View File

@ -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 (

4
pkg/api/session.go
View File

@ -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 {

1
pkg/cli/cli.go
View File

@ -1,3 +1,4 @@
//go:build extended
// +build extended
package cli

5
pkg/cli/client.go
View File

@ -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

7
pkg/cli/client_test.go
View File

@ -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 (

3
pkg/cli/config_cmd.go
View File

@ -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"
)

3
pkg/cli/config_cmd_test.go
View File

@ -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"
)

3
pkg/cli/cve_cmd.go
View File

@ -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"

11
pkg/cli/cve_cmd_test.go
View File

@ -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) {

3
pkg/cli/image_cmd.go
View File

@ -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 {

11
pkg/cli/image_cmd_test.go
View File

@ -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) {

1
pkg/cli/minimal.go
View File

@ -1,3 +1,4 @@
//go:build minimal
// +build minimal
package cli

8
pkg/cli/root.go
View File

@ -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

4
pkg/cli/root_test.go
View File

@ -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) {

3
pkg/cli/searcher.go
View File

@ -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 {

3
pkg/cli/service.go
View File

@ -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 {

6
pkg/compliance/v1_0_0/check.go
View File

@ -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) {

10
pkg/compliance/v1_0_0/check_test.go
View File

@ -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

1
pkg/exporter/api/config.go
View File

@ -1,3 +1,4 @@
//go:build minimal
// +build minimal
package api

3
pkg/exporter/api/controller.go
View File

@ -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 {

11
pkg/exporter/api/controller_test.go
View File

@ -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 (

5
pkg/exporter/api/exporter.go
View File

@ -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 {

5
pkg/exporter/cli/cli.go
View File

@ -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"

2
pkg/extensions/config/config.go
View File

@ -3,7 +3,7 @@ package config
import (
"time"
"github.com/anuvu/zot/pkg/extensions/sync"
"zotregistry.io/zot/pkg/extensions/sync"
)
type ExtensionConfig struct {

12
pkg/extensions/extensions.go
View File

@ -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 ...

7
pkg/extensions/minimal.go
View File

@ -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

3
pkg/extensions/monitoring/extension.go
View File

@ -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"

3
pkg/extensions/monitoring/minimal.go
View File

@ -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 (

3
pkg/extensions/monitoring/minimal_client.go
View File

@ -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 (

2
pkg/extensions/search/common/common.go
View File

@ -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 (

17
pkg/extensions/search/common/common_test.go
View File

@ -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

6
pkg/extensions/search/common/oci_layout.go
View File

@ -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 ...

6
pkg/extensions/search/cve/cve.go
View File

@ -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 {

19
pkg/extensions/search/cve/cve_test.go
View File

@ -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

6
pkg/extensions/search/cve/models.go
View File

@ -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 ...

6
pkg/extensions/search/digest/digest.go
View File

@ -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.

17
pkg/extensions/search/digest/digest_test.go
View File

@ -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

10
pkg/extensions/search/resolver.go
View File

@ -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 ...

4
pkg/extensions/sync/http_handler.go
View File

@ -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 {

4
pkg/extensions/sync/on_demand.go
View File

@ -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,

6
pkg/extensions/sync/sync.go
View File

@ -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 (

10
pkg/extensions/sync/sync_internal_test.go
View File

@ -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 (

11
pkg/extensions/sync/sync_test.go
View File

@ -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 (

8
pkg/extensions/sync/utils.go
View File

@ -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.

7
pkg/log/log_test.go
View File

@ -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 (

4
pkg/storage/cache.go
View File

@ -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 (

6
pkg/storage/cache_test.go
View File

@ -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) {

10
pkg/storage/s3/s3_test.go
View File

@ -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"

8
pkg/storage/s3/storage.go
View File

@ -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"

6
pkg/storage/storage_fs.go
View File

@ -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 (

8
pkg/storage/storage_fs_test.go
View File

@ -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) {

8
pkg/storage/storage_test.go
View File

@ -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"

6
stacker.yaml
View File

@ -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

2
swagger/docs_test.go
View File

@ -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) {

3
test/common_test.go
View File

@ -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) {