diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5f9d7bb195..dbb7eb823e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,6 +8,22 @@ on: pull_request: jobs: + project: + name: Project Checks + runs-on: ubuntu-20.04 + timeout-minutes: 20 + steps: + - uses: actions/setup-go@v2 + with: + go-version: 1.16.x + - uses: actions/checkout@v2 + with: + path: src/github.com/containerd/nerdctl + fetch-depth: 25 + - uses: containerd/project-checks@v1 + with: + working-directory: src/github.com/containerd/nerdctl + golangci-lint: runs-on: ubuntu-20.04 timeout-minutes: 20 diff --git a/Dockerfile b/Dockerfile index 70de0d5fc2..b4ab1fff5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,18 @@ +# Copyright The containerd Authors. + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ----------------------------------------------------------------------------- # Usage: `docker run -it --privileged `. Make sure to add `-t` and `--privileged`. # Basic deps @@ -27,8 +42,8 @@ ARG CONTAINERIZED_SYSTEMD_VERSION=0.1.1 FROM golang:${GO_VERSION}-alpine AS build-minimal RUN apk add --no-cache make git -COPY . /go/src/github.com/AkihiroSuda/nerdctl -WORKDIR /go/src/github.com/AkihiroSuda/nerdctl +COPY . /go/src/github.com/containerd/nerdctl +WORKDIR /go/src/github.com/containerd/nerdctl RUN BINDIR=/out/bin make binaries install # We do not set CMD to `go test` here, because it requires systemd @@ -38,7 +53,7 @@ COPY README.md /out/share/doc/nerdctl/ COPY docs /out/share/doc/nerdctl/docs RUN mkdir -p /out/share/doc/nerdctl-full && \ echo "# nerdctl (full distribution)" > /out/share/doc/nerdctl-full/README.md && \ - echo "- nerdctl: $(cd /go/src/github.com/AkihiroSuda/nerdctl && git describe --tags)" >> /out/share/doc/nerdctl-full/README.md + echo "- nerdctl: $(cd /go/src/github.com/containerd/nerdctl && git describe --tags)" >> /out/share/doc/nerdctl-full/README.md ARG TARGETARCH ARG CONTAINERD_VERSION RUN curl -L https://github.com/containerd/containerd/releases/download/v${CONTAINERD_VERSION}/containerd-${CONTAINERD_VERSION}-linux-${TARGETARCH:-amd64}.tar.gz | tar xzvC /out && \ @@ -138,8 +153,8 @@ COPY --from=goversion /GOVERSION /GOVERSION ARG TARGETARCH RUN curl -L https://golang.org/dl/$(cat /GOVERSION).linux-${TARGETARCH:-amd64}.tar.gz | tar xzvC /usr/local ENV PATH=/usr/local/go/bin:$PATH -COPY . /go/src/github.com/AkihiroSuda/nerdctl -WORKDIR /go/src/github.com/AkihiroSuda/nerdctl +COPY . /go/src/github.com/containerd/nerdctl +WORKDIR /go/src/github.com/containerd/nerdctl ENV CGO_ENABLED=0 CMD ["go", "test", "-v", "./..."] diff --git a/MAINTAINERS b/MAINTAINERS new file mode 100644 index 0000000000..792dcfd01c --- /dev/null +++ b/MAINTAINERS @@ -0,0 +1,4 @@ +# nerdctl maintainers +# +# As a containerd sub-project, containerd maintainers are also included from https://github.com/containerd/project/blob/master/MAINTAINERS. +# See https://github.com/containerd/project/blob/master/GOVERNANCE.md for description of maintainer role diff --git a/Makefile b/Makefile index 18e8ff86ca..987a3fb2da 100644 --- a/Makefile +++ b/Makefile @@ -1,23 +1,27 @@ -# Copyright (C) The Kubernetes Authors. -# Copyright (C) containerd Authors. -# Copyright (C) nerdctl Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright The containerd Authors. + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ----------------------------------------------------------------------------- +# Portions from https://github.com/kubernetes-sigs/cri-tools/blob/v1.19.0/Makefile +# Copyright The Kubernetes Authors. +# Licensed under the Apache License, Version 2.0 +# ----------------------------------------------------------------------------- GO ?= go -PACKAGE := github.com/AkihiroSuda/nerdctl +PACKAGE := github.com/containerd/nerdctl BINDIR ?= /usr/local/bin VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always --tags) diff --git a/README.md b/README.md index dc3367f895..7711c162be 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[[⬇️ **Download]**](https://github.com/AkihiroSuda/nerdctl/releases) +[[⬇️ **Download]**](https://github.com/containerd/nerdctl/releases) [[📖 **Command reference]**](#command-reference) [[📚 **Additional documents]**](#additional-documents) @@ -14,6 +14,8 @@ ✅ Supports [encrypted images (ocicrypt)](./docs/ocicrypt.md) +nerdctl is a **non-core** sub-project of containerd. + ## Examples ### Basic usage @@ -51,7 +53,7 @@ $ nerdctl run -d -p 8080:80 --name nginx nginx:alpine See [`./docs/rootless.md`](./docs/rootless.md). ## Install -Binaries are available for amd64, arm64, and arm-v7: https://github.com/AkihiroSuda/nerdctl/releases +Binaries are available for amd64, arm64, and arm-v7: https://github.com/containerd/nerdctl/releases In addition to containerd, the following components should be installed (optional): - [CNI plugins](https://github.com/containernetworking/plugins): for using `nerdctl run`. @@ -109,12 +111,19 @@ Trivial: - [PouchContainer (abandoned?)](https://github.com/alibaba/pouch): needs an extra daemon ## Developer guide +nerdctl is a containerd **non-core** sub-project, licensed under the [Apache 2.0 license](./LICENSE). +As a containerd non-core sub-project, you will find the: + * [Project governance](https://github.com/containerd/project/blob/master/GOVERNANCE.md), + * [Maintainers](./MAINTAINERS), + * and [Contributing guidelines](https://github.com/containerd/project/blob/master/CONTRIBUTING.md) + +information in our [`containerd/project`](https://github.com/containerd/project) repository. ### Compiling nerdctl from source Run `make && sudo make install`. -Using `go get github.com/AkihiroSuda/nerdctl` is possible, but unrecommended because it does not fill version strings printed in `nerdctl version` +Using `go get github.com/containerd/nerdctl` is possible, but unrecommended because it does not fill version strings printed in `nerdctl version` ### Test suite #### Running test suite against nerdctl diff --git a/build.go b/build.go index 5e788b6a5e..fc3a5f3a69 100644 --- a/build.go +++ b/build.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,9 +21,9 @@ import ( "os/exec" "strings" - "github.com/AkihiroSuda/nerdctl/pkg/buildkitutil" - "github.com/AkihiroSuda/nerdctl/pkg/defaults" - "github.com/AkihiroSuda/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/pkg/buildkitutil" + "github.com/containerd/nerdctl/pkg/defaults" + "github.com/containerd/nerdctl/pkg/strutil" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/build_test.go b/build_test.go index 53e6cad496..b03dae4757 100644 --- a/build_test.go +++ b/build_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,7 +23,7 @@ import ( "path/filepath" "testing" - "github.com/AkihiroSuda/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/client.go b/client.go index 8123db8db9..4fd732d045 100644 --- a/client.go +++ b/client.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/commit.go b/commit.go index 52642cbd0d..02e35b0901 100644 --- a/commit.go +++ b/commit.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,9 +20,9 @@ import ( "context" "fmt" - "github.com/AkihiroSuda/nerdctl/pkg/idutil/containerwalker" - "github.com/AkihiroSuda/nerdctl/pkg/imgutil/commit" refdocker "github.com/containerd/containerd/reference/docker" + "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/pkg/imgutil/commit" "github.com/pkg/errors" "github.com/urfave/cli/v2" ) diff --git a/completion.go b/completion.go index b28f86c11e..4485d13886 100644 --- a/completion.go +++ b/completion.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,8 +21,8 @@ import ( "os" "strings" - "github.com/AkihiroSuda/nerdctl/pkg/labels" - "github.com/AkihiroSuda/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/pkg/netutil" "github.com/urfave/cli/v2" ) diff --git a/completion_test.go b/completion_test.go index 4a9c28639d..fa4fe4f13d 100644 --- a/completion_test.go +++ b/completion_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,7 +19,7 @@ package main import ( "testing" - "github.com/AkihiroSuda/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/pkg/testutil" ) func TestCompletion(t *testing.T) { diff --git a/container.go b/container.go index 1887a497ad..ded7592f2c 100644 --- a/container.go +++ b/container.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/container_inspect.go b/container_inspect.go index 2fce156b1d..3a293ac626 100644 --- a/container_inspect.go +++ b/container_inspect.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,9 +22,9 @@ import ( "fmt" "time" - "github.com/AkihiroSuda/nerdctl/pkg/containerinspector" - "github.com/AkihiroSuda/nerdctl/pkg/idutil/containerwalker" - "github.com/AkihiroSuda/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/pkg/containerinspector" + "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" "github.com/pkg/errors" "github.com/urfave/cli/v2" ) diff --git a/docs/registry.md b/docs/registry.md index 45b335d50b..8dff774e53 100644 --- a/docs/registry.md +++ b/docs/registry.md @@ -18,4 +18,4 @@ $ nerdctl --insecure-registry run --rm 192.168.12.34:5000/foo Currently, rootless nerdctl cannot pull images from 127.0.0.1, because the pull operation occurs in RootlessKit's network namespace. -See https://github.com/AkihiroSuda/nerdctl/issues/86 for the discussion about workarounds. +See https://github.com/containerd/nerdctl/issues/86 for the discussion about workarounds. diff --git a/events.go b/events.go index b8969ede8c..e98913e24d 100644 --- a/events.go +++ b/events.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/exec.go b/exec.go index 67d5481b35..36b0505144 100644 --- a/exec.go +++ b/exec.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,15 +21,15 @@ import ( "io" "os" - "github.com/AkihiroSuda/nerdctl/pkg/idutil/containerwalker" - "github.com/AkihiroSuda/nerdctl/pkg/strutil" - "github.com/AkihiroSuda/nerdctl/pkg/taskutil" "github.com/containerd/console" "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/cmd/ctr/commands/tasks" "github.com/containerd/containerd/pkg/cap" + "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/pkg/taskutil" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/extras/rootless/containerd-rootless-setuptool.sh b/extras/rootless/containerd-rootless-setuptool.sh index 5d8bfb094d..075a1dae19 100755 --- a/extras/rootless/containerd-rootless-setuptool.sh +++ b/extras/rootless/containerd-rootless-setuptool.sh @@ -1,22 +1,23 @@ #!/bin/sh -# Copyright (C) containerd Authors. -# Copyright (C) nerdctl Authors. -# Copyright (C) Moby Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# Forked from https://github.com/moby/moby/blob/v20.10.3/contrib/dockerd-rootless-setuptool.sh +# Copyright The containerd Authors. + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ----------------------------------------------------------------------------- +# Forked from https://github.com/moby/moby/blob/v20.10.3/contrib/dockerd-rootless-setuptool.sh +# Copyright The Moby Authors. +# Licensed under the Apache License, Version 2.0 # ----------------------------------------------------------------------------- # containerd-rootless-setuptool.sh: setup tool for containerd-rootless.sh diff --git a/extras/rootless/containerd-rootless.sh b/extras/rootless/containerd-rootless.sh index 57cf5221df..d62b41bdc9 100755 --- a/extras/rootless/containerd-rootless.sh +++ b/extras/rootless/containerd-rootless.sh @@ -1,23 +1,25 @@ #!/bin/sh -# Copyright (C) containerd Authors. -# Copyright (C) nerdctl Authors. -# Copyright (C) Moby Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# Forked from https://github.com/moby/moby/blob/v20.10.3/contrib/dockerd-rootless.sh +# Copyright The containerd Authors. + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ----------------------------------------------------------------------------- +# Forked from https://github.com/moby/moby/blob/v20.10.3/contrib/dockerd-rootless.sh +# Copyright The Moby Authors. +# Licensed under the Apache License, Version 2.0 +# ----------------------------------------------------------------------------- + # containerd-rootless.sh executes containerd in rootless mode. # # Usage: containerd-rootless.sh [CONTAINERD_OPTIONS] diff --git a/go.mod b/go.mod index ebe05dcab7..c34867986b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/AkihiroSuda/nerdctl +module github.com/containerd/nerdctl go 1.16 diff --git a/hack/generate-release-note.sh b/hack/generate-release-note.sh index 2824c11244..0e8427ca4f 100755 --- a/hack/generate-release-note.sh +++ b/hack/generate-release-note.sh @@ -1,4 +1,19 @@ #!/bin/bash + +# Copyright The containerd Authors. + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + minimal_amd64tgz="$(find _output -name '*amd64.tar.gz*' -and ! -name '*full*')" full_amd64tgz="$(find _output -name '*amd64.tar.gz*' -and -name '*full*')" diff --git a/image.go b/image.go index 70ddd1ee93..3e04f70b10 100644 --- a/image.go +++ b/image.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/image_convert.go b/image_convert.go index 308f9bd506..620e58866c 100644 --- a/image_convert.go +++ b/image_convert.go @@ -1,5 +1,4 @@ /* - Copyright The nerdctl Authors. Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,11 +22,11 @@ import ( "fmt" "os" - "github.com/AkihiroSuda/nerdctl/pkg/strutil" "github.com/containerd/containerd/images/converter" "github.com/containerd/containerd/images/converter/uncompress" "github.com/containerd/containerd/platforms" refdocker "github.com/containerd/containerd/reference/docker" + "github.com/containerd/nerdctl/pkg/strutil" "github.com/containerd/stargz-snapshotter/estargz" estargzconvert "github.com/containerd/stargz-snapshotter/nativeconverter/estargz" "github.com/containerd/stargz-snapshotter/recorder" diff --git a/image_convert_test.go b/image_convert_test.go index cc942d9968..7cc491880a 100644 --- a/image_convert_test.go +++ b/image_convert_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,7 +19,7 @@ package main import ( "testing" - "github.com/AkihiroSuda/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/pkg/testutil" ) func TestImageConvertEStargz(t *testing.T) { diff --git a/images.go b/images.go index 65f109c147..912f995c70 100644 --- a/images.go +++ b/images.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/images_test.go b/images_test.go index 2f9bad780f..8cafca5f8f 100644 --- a/images_test.go +++ b/images_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/info.go b/info.go index ce3e76ab17..87416c3597 100644 --- a/info.go +++ b/info.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,12 +21,12 @@ import ( "fmt" "strings" - "github.com/AkihiroSuda/nerdctl/pkg/defaults" - "github.com/AkihiroSuda/nerdctl/pkg/infoutil" - "github.com/AkihiroSuda/nerdctl/pkg/rootlessutil" "github.com/containerd/cgroups" pkgapparmor "github.com/containerd/containerd/pkg/apparmor" "github.com/containerd/containerd/services/introspection" + "github.com/containerd/nerdctl/pkg/defaults" + "github.com/containerd/nerdctl/pkg/infoutil" + "github.com/containerd/nerdctl/pkg/rootlessutil" ptypes "github.com/gogo/protobuf/types" "github.com/urfave/cli/v2" ) diff --git a/inspect.go b/inspect.go index 52b4cb817e..f29df0d72f 100644 --- a/inspect.go +++ b/inspect.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/internal.go b/internal.go index c1e145f7dc..2dd7fff9c6 100644 --- a/internal.go +++ b/internal.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/internal_oci_hook.go b/internal_oci_hook.go index 3bc7a4e217..27dd545621 100644 --- a/internal_oci_hook.go +++ b/internal_oci_hook.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,7 +17,7 @@ package main import ( - "github.com/AkihiroSuda/nerdctl/pkg/ocihook" + "github.com/containerd/nerdctl/pkg/ocihook" "github.com/pkg/errors" "github.com/urfave/cli/v2" ) diff --git a/kill.go b/kill.go index 39a181c17a..756df08c8e 100644 --- a/kill.go +++ b/kill.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,10 +23,10 @@ import ( "strings" "syscall" - "github.com/AkihiroSuda/nerdctl/pkg/idutil/containerwalker" "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/errdefs" + "github.com/containerd/nerdctl/pkg/idutil/containerwalker" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/load.go b/load.go index b9ae7b8bcb..6f3f05d734 100644 --- a/load.go +++ b/load.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/login.go b/login.go index d5503d870f..db7e76534e 100644 --- a/login.go +++ b/login.go @@ -1,5 +1,5 @@ /* - Copyright (C) nerdctl authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/logout.go b/logout.go index e42e0cfebc..c6647daf2f 100644 --- a/logout.go +++ b/logout.go @@ -1,16 +1,17 @@ /* + Copyright The containerd Authors. - Copyright (C) nerdctl authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - */ package main diff --git a/logs.go b/logs.go index ac4f96c027..1d3d682da3 100644 --- a/logs.go +++ b/logs.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,9 +22,9 @@ import ( "os" "os/exec" - "github.com/AkihiroSuda/nerdctl/pkg/idutil/containerwalker" - "github.com/AkihiroSuda/nerdctl/pkg/logging/jsonfile" "github.com/containerd/containerd" + "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/pkg/logging/jsonfile" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/logs_test.go b/logs_test.go index 7cb3b123c3..2e1ec81c42 100644 --- a/logs_test.go +++ b/logs_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,7 +20,7 @@ import ( "testing" "time" - "github.com/AkihiroSuda/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/pkg/testutil" ) func TestLogs(t *testing.T) { diff --git a/main.go b/main.go index 26de5587fe..c026ef3fee 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,13 +21,13 @@ import ( "os" "strings" - ncdefaults "github.com/AkihiroSuda/nerdctl/pkg/defaults" - "github.com/AkihiroSuda/nerdctl/pkg/logging" - "github.com/AkihiroSuda/nerdctl/pkg/rootlessutil" - "github.com/AkihiroSuda/nerdctl/pkg/version" "github.com/containerd/containerd" "github.com/containerd/containerd/defaults" "github.com/containerd/containerd/namespaces" + ncdefaults "github.com/containerd/nerdctl/pkg/defaults" + "github.com/containerd/nerdctl/pkg/logging" + "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/pkg/version" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/main_test.go b/main_test.go index 25d8769f32..ab14398792 100644 --- a/main_test.go +++ b/main_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,14 +19,14 @@ package main import ( "testing" - "github.com/AkihiroSuda/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/pkg/testutil" ) func TestMain(m *testing.M) { testutil.M(m) } -// TestIssue108 tests https://github.com/AkihiroSuda/nerdctl/issues/108 +// TestIssue108 tests https://github.com/containerd/nerdctl/issues/108 // ("`nerdctl run --net=host -it` fails while `nerdctl run -it --net=host` works") func TestIssue108(t *testing.T) { base := testutil.NewBase(t) diff --git a/namespace.go b/namespace.go index 46fb4f9ec9..1613554c7b 100644 --- a/namespace.go +++ b/namespace.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,8 +22,8 @@ import ( "os" "text/tabwriter" - "github.com/AkihiroSuda/nerdctl/pkg/mountutil/volumestore" "github.com/containerd/containerd/namespaces" + "github.com/containerd/nerdctl/pkg/mountutil/volumestore" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/network.go b/network.go index 18c0e6ca19..77e59537ee 100644 --- a/network.go +++ b/network.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/network_create.go b/network_create.go index f4d628e4f1..371b02697c 100644 --- a/network_create.go +++ b/network_create.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,9 +23,9 @@ import ( "path/filepath" "regexp" - "github.com/AkihiroSuda/nerdctl/pkg/lockutil" - "github.com/AkihiroSuda/nerdctl/pkg/netutil" "github.com/containerd/containerd/errdefs" + "github.com/containerd/nerdctl/pkg/lockutil" + "github.com/containerd/nerdctl/pkg/netutil" "github.com/pkg/errors" "github.com/urfave/cli/v2" ) diff --git a/network_inspect.go b/network_inspect.go index 4cb8017c02..455331781c 100644 --- a/network_inspect.go +++ b/network_inspect.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,8 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/AkihiroSuda/nerdctl/pkg/inspecttypes/native" - "github.com/AkihiroSuda/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/pkg/netutil" "github.com/pkg/errors" "github.com/urfave/cli/v2" ) diff --git a/network_ls.go b/network_ls.go index e3d2bf8dbb..a8748d41d4 100644 --- a/network_ls.go +++ b/network_ls.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,7 +21,7 @@ import ( "strconv" "text/tabwriter" - "github.com/AkihiroSuda/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/pkg/netutil" "github.com/urfave/cli/v2" ) diff --git a/network_rm.go b/network_rm.go index a35ee2f37b..fd62eb60f1 100644 --- a/network_rm.go +++ b/network_rm.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,8 +20,8 @@ import ( "fmt" "os" - "github.com/AkihiroSuda/nerdctl/pkg/lockutil" - "github.com/AkihiroSuda/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/pkg/lockutil" + "github.com/containerd/nerdctl/pkg/netutil" "github.com/pkg/errors" "github.com/urfave/cli/v2" ) diff --git a/pause.go b/pause.go index 1288c589a2..29b8915f5a 100644 --- a/pause.go +++ b/pause.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,9 +20,9 @@ import ( "context" "fmt" - "github.com/AkihiroSuda/nerdctl/pkg/idutil/containerwalker" "github.com/containerd/containerd" "github.com/containerd/containerd/cio" + "github.com/containerd/nerdctl/pkg/idutil/containerwalker" "github.com/pkg/errors" "github.com/urfave/cli/v2" ) diff --git a/pkg/buildkitutil/buildkitutil.go b/pkg/buildkitutil/buildkitutil.go index 141c81d7f2..f1d2184ead 100644 --- a/pkg/buildkitutil/buildkitutil.go +++ b/pkg/buildkitutil/buildkitutil.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,7 +20,7 @@ import ( "os" "os/exec" - "github.com/AkihiroSuda/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/pkg/rootlessutil" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/containerinspector/containerinspector.go b/pkg/containerinspector/containerinspector.go index 1a5d5539d6..2bbac5fbaa 100644 --- a/pkg/containerinspector/containerinspector.go +++ b/pkg/containerinspector/containerinspector.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,8 +22,8 @@ import ( "net" "strings" - "github.com/AkihiroSuda/nerdctl/pkg/inspecttypes/native" "github.com/containerd/containerd" + "github.com/containerd/nerdctl/pkg/inspecttypes/native" "github.com/containerd/typeurl" "github.com/containernetworking/plugins/pkg/ns" "github.com/sirupsen/logrus" diff --git a/pkg/defaults/cgroup.go b/pkg/defaults/cgroup.go index 1f1f878db0..81e0eb4e07 100644 --- a/pkg/defaults/cgroup.go +++ b/pkg/defaults/cgroup.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,8 +19,8 @@ package defaults import ( "os" - "github.com/AkihiroSuda/nerdctl/pkg/rootlessutil" "github.com/containerd/cgroups" + "github.com/containerd/nerdctl/pkg/rootlessutil" ) func IsSystemdAvailable() bool { diff --git a/pkg/defaults/defaults.go b/pkg/defaults/defaults.go index aa4014e256..a69c590d93 100644 --- a/pkg/defaults/defaults.go +++ b/pkg/defaults/defaults.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,8 +21,8 @@ import ( "os" "path/filepath" - "github.com/AkihiroSuda/nerdctl/pkg/rootlessutil" gocni "github.com/containerd/go-cni" + "github.com/containerd/nerdctl/pkg/rootlessutil" "github.com/sirupsen/logrus" ) diff --git a/pkg/dnsutil/dnsutil.go b/pkg/dnsutil/dnsutil.go index ab58999241..72ee523e33 100644 --- a/pkg/dnsutil/dnsutil.go +++ b/pkg/dnsutil/dnsutil.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/dnsutil/hostsstore/hostsstore.go b/pkg/dnsutil/hostsstore/hostsstore.go index 0832d79e59..ec7c3c9b4c 100644 --- a/pkg/dnsutil/hostsstore/hostsstore.go +++ b/pkg/dnsutil/hostsstore/hostsstore.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,9 +25,9 @@ import ( "os" "path/filepath" - "github.com/AkihiroSuda/nerdctl/pkg/lockutil" "github.com/containerd/containerd/errdefs" "github.com/containerd/go-cni" + "github.com/containerd/nerdctl/pkg/lockutil" ) const ( diff --git a/pkg/dnsutil/hostsstore/updater.go b/pkg/dnsutil/hostsstore/updater.go index 910a140bba..3778c35b72 100644 --- a/pkg/dnsutil/hostsstore/updater.go +++ b/pkg/dnsutil/hostsstore/updater.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,8 +25,8 @@ import ( "path/filepath" "strings" - "github.com/AkihiroSuda/nerdctl/pkg/netutil" "github.com/containerd/containerd/errdefs" + "github.com/containerd/nerdctl/pkg/netutil" "github.com/sirupsen/logrus" ) diff --git a/pkg/dnsutil/hostsstore/updater_test.go b/pkg/dnsutil/hostsstore/updater_test.go index 38877bb498..7e0e6e009d 100644 --- a/pkg/dnsutil/hostsstore/updater_test.go +++ b/pkg/dnsutil/hostsstore/updater_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/idutil/containerwalker/containerwalker.go b/pkg/idutil/containerwalker/containerwalker.go index 97fa7ab849..d581ef3b8b 100644 --- a/pkg/idutil/containerwalker/containerwalker.go +++ b/pkg/idutil/containerwalker/containerwalker.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,8 +21,8 @@ import ( "fmt" "regexp" - "github.com/AkihiroSuda/nerdctl/pkg/labels" "github.com/containerd/containerd" + "github.com/containerd/nerdctl/pkg/labels" ) type Found struct { diff --git a/pkg/idutil/imagewalker/imagewalker.go b/pkg/idutil/imagewalker/imagewalker.go index 2166716031..ba97a21c26 100644 --- a/pkg/idutil/imagewalker/imagewalker.go +++ b/pkg/idutil/imagewalker/imagewalker.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/imgutil/commit/commit.go b/pkg/imgutil/commit/commit.go index 6ae92bbe49..e676d3bc93 100644 --- a/pkg/imgutil/commit/commit.go +++ b/pkg/imgutil/commit/commit.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/imgutil/dockerconfigresolver/dockerconfigresolver.go b/pkg/imgutil/dockerconfigresolver/dockerconfigresolver.go index 089f6b5f09..988658aa2b 100644 --- a/pkg/imgutil/dockerconfigresolver/dockerconfigresolver.go +++ b/pkg/imgutil/dockerconfigresolver/dockerconfigresolver.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/imgutil/imgutil.go b/pkg/imgutil/imgutil.go index 598e04a8e8..c53af1d3d0 100644 --- a/pkg/imgutil/imgutil.go +++ b/pkg/imgutil/imgutil.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,13 +21,13 @@ import ( "io" "strings" - "github.com/AkihiroSuda/nerdctl/pkg/imgutil/dockerconfigresolver" - "github.com/AkihiroSuda/nerdctl/pkg/imgutil/pull" "github.com/containerd/containerd" refdocker "github.com/containerd/containerd/reference/docker" "github.com/containerd/containerd/remotes" "github.com/containerd/imgcrypt" "github.com/containerd/imgcrypt/images/encryption" + "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/pkg/imgutil/pull" "github.com/containerd/stargz-snapshotter/fs/source" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/imgutil/pull/pull.go b/pkg/imgutil/pull/pull.go index e1c16f7103..2ac957c888 100644 --- a/pkg/imgutil/pull/pull.go +++ b/pkg/imgutil/pull/pull.go @@ -1,5 +1,4 @@ /* - Copyright The nerdctl Authors. Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/pkg/imgutil/push/push.go b/pkg/imgutil/push/push.go index 3b2437d7c4..4d6de0ff9c 100644 --- a/pkg/imgutil/push/push.go +++ b/pkg/imgutil/push/push.go @@ -1,5 +1,4 @@ /* - Copyright The nerdctl Authors. Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/pkg/infoutil/infoutil.go b/pkg/infoutil/infoutil.go index 97afd921d9..c82bbbfb80 100644 --- a/pkg/infoutil/infoutil.go +++ b/pkg/infoutil/infoutil.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/infoutil/infoutil_test.go b/pkg/infoutil/infoutil_test.go index fb7b170343..90628f0b0a 100644 --- a/pkg/infoutil/infoutil_test.go +++ b/pkg/infoutil/infoutil_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/inspecttypes/dockercompat/dockercompat.go b/pkg/inspecttypes/dockercompat/dockercompat.go index b86fd3d467..13f8c2b47b 100644 --- a/pkg/inspecttypes/dockercompat/dockercompat.go +++ b/pkg/inspecttypes/dockercompat/dockercompat.go @@ -1,7 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. - Copyright (C) Docker/Moby authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,6 +14,12 @@ limitations under the License. */ +/* + Portions from https://github.com/moby/moby/blob/v20.10.1/api/types/types.go + Copyright (C) Docker/Moby authors. + Licensed under the Apache License, Version 2.0 +*/ + // Package dockercompat mimics `docker inspect` objects. package dockercompat @@ -27,9 +31,9 @@ import ( "runtime" "time" - "github.com/AkihiroSuda/nerdctl/pkg/inspecttypes/native" - "github.com/AkihiroSuda/nerdctl/pkg/labels" "github.com/containerd/containerd" + "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/pkg/labels" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) diff --git a/pkg/inspecttypes/native/container.go b/pkg/inspecttypes/native/container.go index 6d1b6f1f33..e73248a21a 100644 --- a/pkg/inspecttypes/native/container.go +++ b/pkg/inspecttypes/native/container.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/inspecttypes/native/network.go b/pkg/inspecttypes/native/network.go index 0c4e9ffd68..be4fd82fff 100644 --- a/pkg/inspecttypes/native/network.go +++ b/pkg/inspecttypes/native/network.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/inspecttypes/native/volume.go b/pkg/inspecttypes/native/volume.go index da4e488f6c..f2cfce5e6d 100644 --- a/pkg/inspecttypes/native/volume.go +++ b/pkg/inspecttypes/native/volume.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/labels/labels.go b/pkg/labels/labels.go index a319da50ec..8ecfc2ed21 100644 --- a/pkg/labels/labels.go +++ b/pkg/labels/labels.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/lockutil/lockutil.go b/pkg/lockutil/lockutil.go index 45073df9c1..f779a89e05 100644 --- a/pkg/lockutil/lockutil.go +++ b/pkg/lockutil/lockutil.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/logging/jsonfile/jsonfile.go b/pkg/logging/jsonfile/jsonfile.go index 4659c48da6..975525ff3a 100644 --- a/pkg/logging/jsonfile/jsonfile.go +++ b/pkg/logging/jsonfile/jsonfile.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/logging/logging.go b/pkg/logging/logging.go index de683e1726..0c9b1f7417 100644 --- a/pkg/logging/logging.go +++ b/pkg/logging/logging.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,8 +21,8 @@ import ( "os" "path/filepath" - "github.com/AkihiroSuda/nerdctl/pkg/logging/jsonfile" "github.com/containerd/containerd/runtime/v2/logging" + "github.com/containerd/nerdctl/pkg/logging/jsonfile" "github.com/pkg/errors" ) diff --git a/pkg/mountutil/mountutil.go b/pkg/mountutil/mountutil.go index 762d5fc8d4..8345517ac5 100644 --- a/pkg/mountutil/mountutil.go +++ b/pkg/mountutil/mountutil.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,7 +20,7 @@ import ( "path/filepath" "strings" - "github.com/AkihiroSuda/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/pkg/inspecttypes/native" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/mountutil/volumestore/volumestore.go b/pkg/mountutil/volumestore/volumestore.go index 68bd2d902b..69de553d23 100644 --- a/pkg/mountutil/volumestore/volumestore.go +++ b/pkg/mountutil/volumestore/volumestore.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/namestore/namestore.go b/pkg/namestore/namestore.go index 39784f7db7..fddb9ab8c9 100644 --- a/pkg/namestore/namestore.go +++ b/pkg/namestore/namestore.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,7 +22,7 @@ import ( "path/filepath" "strings" - "github.com/AkihiroSuda/nerdctl/pkg/lockutil" + "github.com/containerd/nerdctl/pkg/lockutil" "github.com/pkg/errors" ) diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go index 1b433b78d2..af92b35f92 100644 --- a/pkg/netutil/netutil.go +++ b/pkg/netutil/netutil.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/ocihook/ocihook.go b/pkg/ocihook/ocihook.go index 8211f2d0f5..2cd2eee629 100644 --- a/pkg/ocihook/ocihook.go +++ b/pkg/ocihook/ocihook.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,15 +25,15 @@ import ( "os" "path/filepath" - "github.com/AkihiroSuda/nerdctl/pkg/defaults" - "github.com/AkihiroSuda/nerdctl/pkg/dnsutil/hostsstore" - "github.com/AkihiroSuda/nerdctl/pkg/labels" - "github.com/AkihiroSuda/nerdctl/pkg/netutil" - "github.com/AkihiroSuda/nerdctl/pkg/rootlessutil" "github.com/containerd/containerd/contrib/apparmor" pkgapparmor "github.com/containerd/containerd/pkg/apparmor" "github.com/containerd/go-cni" gocni "github.com/containerd/go-cni" + "github.com/containerd/nerdctl/pkg/defaults" + "github.com/containerd/nerdctl/pkg/dnsutil/hostsstore" + "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/pkg/rootlessutil" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -196,7 +195,7 @@ func getCNINamespaceOpts(opts *handlerOpts) ([]cni.NamespaceOpts, error) { return []cni.NamespaceOpts{cni.WithCapabilityPortMap(opts.ports)}, nil } // For rootless, we need to modify the hostIP that is not bindable in the child namespace. - // https: //github.com/AkihiroSuda/nerdctl/issues/88 + // https: //github.com/containerd/nerdctl/issues/88 // // We must NOT modify opts.ports here, because we use the unmodified opts.ports for // interaction with RootlessKit API. diff --git a/pkg/portutil/portutil.go b/pkg/portutil/portutil.go index 1a7d17fed5..b453c8ad8e 100644 --- a/pkg/portutil/portutil.go +++ b/pkg/portutil/portutil.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/rootlessutil/child.go b/pkg/rootlessutil/child.go index b77950e3c9..5ea131ef6c 100644 --- a/pkg/rootlessutil/child.go +++ b/pkg/rootlessutil/child.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/rootlessutil/parent.go b/pkg/rootlessutil/parent.go index 6aee7ce707..59f3e31c89 100644 --- a/pkg/rootlessutil/parent.go +++ b/pkg/rootlessutil/parent.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/rootlessutil/port.go b/pkg/rootlessutil/port.go index fdfc564ae0..6187def81b 100644 --- a/pkg/rootlessutil/port.go +++ b/pkg/rootlessutil/port.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/rootlessutil/rootlessutil.go b/pkg/rootlessutil/rootlessutil.go index 693f643088..24f1d34bdc 100644 --- a/pkg/rootlessutil/rootlessutil.go +++ b/pkg/rootlessutil/rootlessutil.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/rootlessutil/xdg.go b/pkg/rootlessutil/xdg.go index 31f2b50694..e2b198cc0f 100644 --- a/pkg/rootlessutil/xdg.go +++ b/pkg/rootlessutil/xdg.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/strutil/strutil.go b/pkg/strutil/strutil.go index 5b26f3597c..e61ea24cc5 100644 --- a/pkg/strutil/strutil.go +++ b/pkg/strutil/strutil.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/strutil/strutil_test.go b/pkg/strutil/strutil_test.go index ac08a203df..7b62f4e014 100644 --- a/pkg/strutil/strutil_test.go +++ b/pkg/strutil/strutil_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/taskutil/taskutil.go b/pkg/taskutil/taskutil.go index d2b790e567..3cd6183637 100644 --- a/pkg/taskutil/taskutil.go +++ b/pkg/taskutil/taskutil.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/testutil/testutil.go b/pkg/testutil/testutil.go index 534fd5b60b..a98950d219 100644 --- a/pkg/testutil/testutil.go +++ b/pkg/testutil/testutil.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -27,9 +26,9 @@ import ( "testing" "time" - "github.com/AkihiroSuda/nerdctl/pkg/buildkitutil" - "github.com/AkihiroSuda/nerdctl/pkg/defaults" - "github.com/AkihiroSuda/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/pkg/buildkitutil" + "github.com/containerd/nerdctl/pkg/defaults" + "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" "github.com/pkg/errors" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" diff --git a/pkg/version/version.go b/pkg/version/version.go index b410d93bbc..d759a8e8cc 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/port.go b/port.go index d0430d4824..0d957eaff0 100644 --- a/port.go +++ b/port.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,10 +23,10 @@ import ( "strconv" "strings" - "github.com/AkihiroSuda/nerdctl/pkg/idutil/containerwalker" - "github.com/AkihiroSuda/nerdctl/pkg/labels" "github.com/containerd/containerd" gocni "github.com/containerd/go-cni" + "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/pkg/labels" "github.com/pkg/errors" "github.com/urfave/cli/v2" ) diff --git a/ps.go b/ps.go index c154f4910f..d512cf2a2f 100644 --- a/ps.go +++ b/ps.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,11 +25,11 @@ import ( "text/tabwriter" "time" - "github.com/AkihiroSuda/nerdctl/pkg/labels" "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/oci" gocni "github.com/containerd/go-cni" + "github.com/containerd/nerdctl/pkg/labels" "github.com/docker/go-units" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/pull.go b/pull.go index d4287a9400..b0f836c4ae 100644 --- a/pull.go +++ b/pull.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,7 +17,7 @@ package main import ( - "github.com/AkihiroSuda/nerdctl/pkg/imgutil" + "github.com/containerd/nerdctl/pkg/imgutil" "github.com/pkg/errors" "github.com/urfave/cli/v2" diff --git a/push.go b/push.go index 46e6f8994d..37ac967dbd 100644 --- a/push.go +++ b/push.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,13 +19,13 @@ package main import ( "context" - "github.com/AkihiroSuda/nerdctl/pkg/imgutil" - "github.com/AkihiroSuda/nerdctl/pkg/imgutil/dockerconfigresolver" - "github.com/AkihiroSuda/nerdctl/pkg/imgutil/push" "github.com/containerd/containerd/images/converter" "github.com/containerd/containerd/platforms" refdocker "github.com/containerd/containerd/reference/docker" "github.com/containerd/containerd/remotes" + "github.com/containerd/nerdctl/pkg/imgutil" + "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/pkg/imgutil/push" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/push_test.go b/push_test.go index 5b0e2b3ccb..dacb6c085f 100644 --- a/push_test.go +++ b/push_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,8 +22,8 @@ import ( "strings" "testing" - "github.com/AkihiroSuda/nerdctl/pkg/testutil" "github.com/containerd/containerd/errdefs" + "github.com/containerd/nerdctl/pkg/testutil" "github.com/pkg/errors" "gotest.tools/v3/assert" ) diff --git a/rm.go b/rm.go index ddbf05c269..1cd27ba38a 100644 --- a/rm.go +++ b/rm.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,13 +22,13 @@ import ( "os" "syscall" - "github.com/AkihiroSuda/nerdctl/pkg/dnsutil/hostsstore" - "github.com/AkihiroSuda/nerdctl/pkg/idutil/containerwalker" - "github.com/AkihiroSuda/nerdctl/pkg/labels" - "github.com/AkihiroSuda/nerdctl/pkg/namestore" "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/errdefs" + "github.com/containerd/nerdctl/pkg/dnsutil/hostsstore" + "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/pkg/namestore" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/rmi.go b/rmi.go index 7d047f217f..a8e4a54228 100644 --- a/rmi.go +++ b/rmi.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,8 +20,8 @@ import ( "context" "fmt" - "github.com/AkihiroSuda/nerdctl/pkg/idutil/imagewalker" "github.com/containerd/containerd/platforms" + "github.com/containerd/nerdctl/pkg/idutil/imagewalker" "github.com/pkg/errors" "github.com/urfave/cli/v2" ) diff --git a/run.go b/run.go index a59afc9671..c2dd1ca95f 100644 --- a/run.go +++ b/run.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -30,17 +29,6 @@ import ( "strings" "time" - "github.com/AkihiroSuda/nerdctl/pkg/defaults" - "github.com/AkihiroSuda/nerdctl/pkg/dnsutil" - "github.com/AkihiroSuda/nerdctl/pkg/dnsutil/hostsstore" - "github.com/AkihiroSuda/nerdctl/pkg/imgutil" - "github.com/AkihiroSuda/nerdctl/pkg/labels" - "github.com/AkihiroSuda/nerdctl/pkg/logging" - "github.com/AkihiroSuda/nerdctl/pkg/namestore" - "github.com/AkihiroSuda/nerdctl/pkg/netutil" - "github.com/AkihiroSuda/nerdctl/pkg/portutil" - "github.com/AkihiroSuda/nerdctl/pkg/strutil" - "github.com/AkihiroSuda/nerdctl/pkg/taskutil" "github.com/containerd/console" "github.com/containerd/containerd" "github.com/containerd/containerd/cio" @@ -52,6 +40,17 @@ import ( "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/runtime/restart" gocni "github.com/containerd/go-cni" + "github.com/containerd/nerdctl/pkg/defaults" + "github.com/containerd/nerdctl/pkg/dnsutil" + "github.com/containerd/nerdctl/pkg/dnsutil/hostsstore" + "github.com/containerd/nerdctl/pkg/imgutil" + "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/pkg/logging" + "github.com/containerd/nerdctl/pkg/namestore" + "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/pkg/portutil" + "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/pkg/taskutil" "github.com/docker/cli/opts" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" @@ -324,7 +323,7 @@ func runAction(clicontext *cli.Context) error { cOpts = append(cOpts, restartOpts...) // DedupeStrSlice is required as a workaround for urfave/cli bug - // https://github.com/AkihiroSuda/nerdctl/issues/108 + // https://github.com/containerd/nerdctl/issues/108 // https://github.com/urfave/cli/issues/1254 portSlice := strutil.DedupeStrSlice(clicontext.StringSlice("p")) netSlice := strutil.DedupeStrSlice(clicontext.StringSlice("net")) diff --git a/run_cgroup.go b/run_cgroup.go index 045eb375f1..e7a10fd163 100644 --- a/run_cgroup.go +++ b/run_cgroup.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,8 +17,8 @@ package main import ( - "github.com/AkihiroSuda/nerdctl/pkg/rootlessutil" "github.com/containerd/containerd/oci" + "github.com/containerd/nerdctl/pkg/rootlessutil" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" diff --git a/run_cgroup_test.go b/run_cgroup_test.go index 6c1930d326..205735f521 100644 --- a/run_cgroup_test.go +++ b/run_cgroup_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,8 +19,8 @@ package main import ( "testing" - "github.com/AkihiroSuda/nerdctl/pkg/testutil" "github.com/containerd/cgroups" + "github.com/containerd/nerdctl/pkg/testutil" ) func TestRunCgroupV2(t *testing.T) { diff --git a/run_mount.go b/run_mount.go index 6068f44de4..72bf38af41 100644 --- a/run_mount.go +++ b/run_mount.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,9 +17,9 @@ package main import ( - "github.com/AkihiroSuda/nerdctl/pkg/mountutil" - "github.com/AkihiroSuda/nerdctl/pkg/strutil" "github.com/containerd/containerd/oci" + "github.com/containerd/nerdctl/pkg/mountutil" + "github.com/containerd/nerdctl/pkg/strutil" "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli/v2" ) diff --git a/run_network_test.go b/run_network_test.go index 739e59566f..697748b4c2 100644 --- a/run_network_test.go +++ b/run_network_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,8 +25,8 @@ import ( "testing" "time" - "github.com/AkihiroSuda/nerdctl/pkg/testutil" "github.com/containerd/containerd/errdefs" + "github.com/containerd/nerdctl/pkg/testutil" "github.com/pkg/errors" "gotest.tools/v3/assert" ) @@ -160,7 +159,7 @@ func TestRunPort(t *testing.T) { port: 8080, }, { - // for https://github.com/AkihiroSuda/nerdctl/issues/88 + // for https://github.com/containerd/nerdctl/issues/88 listenIP: hostIP, connectIP: hostIP, port: 8080, diff --git a/run_restart_test.go b/run_restart_test.go index 1bc3d3a4c4..6093368a70 100644 --- a/run_restart_test.go +++ b/run_restart_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,7 +23,7 @@ import ( "testing" "time" - "github.com/AkihiroSuda/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/pkg/testutil" "github.com/pkg/errors" "gotest.tools/v3/assert" ) diff --git a/run_runtime.go b/run_runtime.go index 1ed7c8fed8..755ef0eaaf 100644 --- a/run_runtime.go +++ b/run_runtime.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/run_security.go b/run_security.go index d4f8e734ae..0136cbcef5 100644 --- a/run_security.go +++ b/run_security.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,12 +20,12 @@ import ( "strconv" "strings" - "github.com/AkihiroSuda/nerdctl/pkg/defaults" - "github.com/AkihiroSuda/nerdctl/pkg/strutil" "github.com/containerd/containerd/contrib/apparmor" "github.com/containerd/containerd/contrib/seccomp" "github.com/containerd/containerd/oci" pkgapparmor "github.com/containerd/containerd/pkg/apparmor" + "github.com/containerd/nerdctl/pkg/defaults" + "github.com/containerd/nerdctl/pkg/strutil" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/run_security_test.go b/run_security_test.go index d9645e40ea..b7ac26d0c4 100644 --- a/run_security_test.go +++ b/run_security_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,7 +21,7 @@ import ( "strings" "testing" - "github.com/AkihiroSuda/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/pkg/testutil" "github.com/pkg/errors" "gotest.tools/v3/assert" ) diff --git a/run_test.go b/run_test.go index ed28e9bdc5..44cfbd22fc 100644 --- a/run_test.go +++ b/run_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -25,7 +24,7 @@ import ( "strings" "testing" - "github.com/AkihiroSuda/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/pkg/testutil" "github.com/pkg/errors" "gotest.tools/v3/assert" ) diff --git a/run_user.go b/run_user.go index 5a37963f22..bc7c982d89 100644 --- a/run_user.go +++ b/run_user.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/save.go b/save.go index 7fdb496156..5d5ae78aa3 100644 --- a/save.go +++ b/save.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/save_test.go b/save_test.go index 55f1191491..9f1b91fe73 100644 --- a/save_test.go +++ b/save_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,7 +25,7 @@ import ( "strings" "testing" - "github.com/AkihiroSuda/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/pkg/testutil" "github.com/pkg/errors" "gotest.tools/v3/assert" ) diff --git a/start.go b/start.go index acc6db32a1..daf2e268a1 100644 --- a/start.go +++ b/start.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,10 +22,10 @@ import ( "net/url" "syscall" - "github.com/AkihiroSuda/nerdctl/pkg/idutil/containerwalker" - "github.com/AkihiroSuda/nerdctl/pkg/labels" "github.com/containerd/containerd" "github.com/containerd/containerd/cio" + "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/pkg/labels" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/stop.go b/stop.go index 9d61c4a086..d7b5d8d6ca 100644 --- a/stop.go +++ b/stop.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,10 +21,10 @@ import ( "fmt" "time" - "github.com/AkihiroSuda/nerdctl/pkg/idutil/containerwalker" "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/errdefs" + "github.com/containerd/nerdctl/pkg/idutil/containerwalker" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/stop_test.go b/stop_test.go index c77a697d0e..ae6574a6de 100644 --- a/stop_test.go +++ b/stop_test.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,7 +22,7 @@ import ( "strings" "testing" - "github.com/AkihiroSuda/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/pkg/testutil" "github.com/pkg/errors" "gotest.tools/v3/assert" ) diff --git a/system.go b/system.go index 9467accec0..94304c8eb7 100644 --- a/system.go +++ b/system.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tag.go b/tag.go index a8bf8e360a..a4b3666931 100644 --- a/tag.go +++ b/tag.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/unpause.go b/unpause.go index 3248dbfa06..398e681393 100644 --- a/unpause.go +++ b/unpause.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,9 +20,9 @@ import ( "context" "fmt" - "github.com/AkihiroSuda/nerdctl/pkg/idutil/containerwalker" "github.com/containerd/containerd" "github.com/containerd/containerd/cio" + "github.com/containerd/nerdctl/pkg/idutil/containerwalker" "github.com/pkg/errors" "github.com/urfave/cli/v2" ) diff --git a/version.go b/version.go index a89b621d51..99d9de28eb 100644 --- a/version.go +++ b/version.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,7 +19,7 @@ package main import ( "fmt" - "github.com/AkihiroSuda/nerdctl/pkg/version" + "github.com/containerd/nerdctl/pkg/version" "github.com/urfave/cli/v2" ) diff --git a/volume.go b/volume.go index f7b3d89c4b..ce5f02a10c 100644 --- a/volume.go +++ b/volume.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,7 +17,7 @@ package main import ( - "github.com/AkihiroSuda/nerdctl/pkg/mountutil/volumestore" + "github.com/containerd/nerdctl/pkg/mountutil/volumestore" "github.com/urfave/cli/v2" ) diff --git a/volume_create.go b/volume_create.go index 59c440ea0b..f3a94ce2fc 100644 --- a/volume_create.go +++ b/volume_create.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,9 +21,9 @@ import ( "os" "path/filepath" - "github.com/AkihiroSuda/nerdctl/pkg/lockutil" - "github.com/AkihiroSuda/nerdctl/pkg/mountutil/volumestore" "github.com/containerd/containerd/identifiers" + "github.com/containerd/nerdctl/pkg/lockutil" + "github.com/containerd/nerdctl/pkg/mountutil/volumestore" "github.com/pkg/errors" "github.com/urfave/cli/v2" ) diff --git a/volume_inspect.go b/volume_inspect.go index e517088095..979285cbc5 100644 --- a/volume_inspect.go +++ b/volume_inspect.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,8 +22,8 @@ import ( "os" "path/filepath" - "github.com/AkihiroSuda/nerdctl/pkg/inspecttypes/native" - "github.com/AkihiroSuda/nerdctl/pkg/mountutil/volumestore" + "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/pkg/mountutil/volumestore" "github.com/pkg/errors" "github.com/urfave/cli/v2" ) diff --git a/volume_ls.go b/volume_ls.go index 34c1723f4b..0879dd42af 100644 --- a/volume_ls.go +++ b/volume_ls.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,8 +22,8 @@ import ( "path/filepath" "text/tabwriter" - "github.com/AkihiroSuda/nerdctl/pkg/inspecttypes/native" - "github.com/AkihiroSuda/nerdctl/pkg/mountutil/volumestore" + "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/pkg/mountutil/volumestore" "github.com/urfave/cli/v2" ) diff --git a/volume_rm.go b/volume_rm.go index b9fbc0219c..e094f24fa9 100644 --- a/volume_rm.go +++ b/volume_rm.go @@ -1,6 +1,5 @@ /* - Copyright (C) nerdctl authors. - Copyright (C) containerd authors. + Copyright The containerd Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,7 +21,7 @@ import ( "os" "path/filepath" - "github.com/AkihiroSuda/nerdctl/pkg/lockutil" + "github.com/containerd/nerdctl/pkg/lockutil" "github.com/pkg/errors" "github.com/urfave/cli/v2" )