From dee883cd1086a4b30f0bb615d85fdc0d2a4d3188 Mon Sep 17 00:00:00 2001 From: WangFengTu Date: Thu, 16 Jan 2020 09:29:16 -0500 Subject: [PATCH] iSulad-kit: Add copyright Signed-off-by: WangFengTu --- cmd/isulad_kit/copy.go | 20 +++++++++++++++++++- cmd/isulad_kit/image.go | 20 +++++++++++++++++++- cmd/isulad_kit/main.go | 20 +++++++++++++++++++- cmd/isulad_kit/runtime.go | 20 +++++++++++++++++++- cmd/isulad_kit/utils.go | 20 +++++++++++++++++++- isula/isula_image.proto | 23 +++++++++++++++++++++-- 6 files changed, 116 insertions(+), 7 deletions(-) diff --git a/cmd/isulad_kit/copy.go b/cmd/isulad_kit/copy.go index 97a4862..0dca410 100644 --- a/cmd/isulad_kit/copy.go +++ b/cmd/isulad_kit/copy.go @@ -1,4 +1,4 @@ -// Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. +// Copyright (c) Huawei Technologies Co., Ltd. 2019-2020. All rights reserved. // iSulad-kit licensed under the Mulan PSL v1. // You can use this software according to the terms and conditions of the Mulan PSL v1. // You may obtain a copy of Mulan PSL v1 at: @@ -11,6 +11,24 @@ // Author: lifeng // Create: 2019-05-06 +// Since some of this code is derived from skopeo, their copyright +// is retained here.... +// +// 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. + +// The original version of this file can be found at +// https://github.com/containers/skopeo/blob/master/cmd/skopeo/copy.go + package main import ( diff --git a/cmd/isulad_kit/image.go b/cmd/isulad_kit/image.go index 6159d43..13a04c1 100644 --- a/cmd/isulad_kit/image.go +++ b/cmd/isulad_kit/image.go @@ -1,4 +1,4 @@ -// Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. +// Copyright (c) Huawei Technologies Co., Ltd. 2019-2020. All rights reserved. // iSulad-kit licensed under the Mulan PSL v1. // You can use this software according to the terms and conditions of the Mulan PSL v1. // You may obtain a copy of Mulan PSL v1 at: @@ -11,6 +11,24 @@ // Author: lifeng // Create: 2019-05-06 +// Since some of this code is derived from cri-o, their copyright +// is retained here.... +// +// 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. +// +// The original version of this file can be found at +// https://github.com/cri-o/cri-o/blob/master/internal/pkg/storage/image.go + package main import ( diff --git a/cmd/isulad_kit/main.go b/cmd/isulad_kit/main.go index d7bb497..a04d63a 100644 --- a/cmd/isulad_kit/main.go +++ b/cmd/isulad_kit/main.go @@ -1,4 +1,4 @@ -// Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. +// Copyright (c) Huawei Technologies Co., Ltd. 2019-2020. All rights reserved. // iSulad-kit licensed under the Mulan PSL v1. // You can use this software according to the terms and conditions of the Mulan PSL v1. // You may obtain a copy of Mulan PSL v1 at: @@ -11,6 +11,24 @@ // Author: lifeng // Create: 2019-05-06 +// Since some of this code is derived from skopeo, their copyright +// is retained here.... +// +// 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. + +// The original version of this file can be found at +// https://github.com/containers/skopeo/blob/master/cmd/skopeo/main.go + package main import ( diff --git a/cmd/isulad_kit/runtime.go b/cmd/isulad_kit/runtime.go index a8d8d21..d8bedbe 100644 --- a/cmd/isulad_kit/runtime.go +++ b/cmd/isulad_kit/runtime.go @@ -1,4 +1,4 @@ -// Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. +// Copyright (c) Huawei Technologies Co., Ltd. 2019-2020. All rights reserved. // iSulad-kit licensed under the Mulan PSL v1. // You can use this software according to the terms and conditions of the Mulan PSL v1. // You may obtain a copy of Mulan PSL v1 at: @@ -11,6 +11,24 @@ // Author: lifeng // Create: 2019-05-06 +// Since some of this code is derived from cri-o, their copyright +// is retained here.... +// +// 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. +// +// The original version of this file can be found at +// https://github.com/cri-o/cri-o/blob/master/internal/pkg/storage/runtime.go + package main import ( diff --git a/cmd/isulad_kit/utils.go b/cmd/isulad_kit/utils.go index fd7f528..e90c8d2 100644 --- a/cmd/isulad_kit/utils.go +++ b/cmd/isulad_kit/utils.go @@ -1,4 +1,4 @@ -// Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. +// Copyright (c) Huawei Technologies Co., Ltd. 2019-2020. All rights reserved. // iSulad-kit licensed under the Mulan PSL v1. // You can use this software according to the terms and conditions of the Mulan PSL v1. // You may obtain a copy of Mulan PSL v1 at: @@ -11,6 +11,24 @@ // Author: lifeng // Create: 2019-05-06 +// Since some of this code is derived from skopeo, their copyright +// is retained here.... +// +// 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. + +// The original version of this file can be found at +// https://github.com/containers/skopeo/blob/master/cmd/skopeo/utils.go + package main import ( diff --git a/isula/isula_image.proto b/isula/isula_image.proto index 07cd101..cc04005 100644 --- a/isula/isula_image.proto +++ b/isula/isula_image.proto @@ -1,4 +1,4 @@ -// Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. +// Copyright (c) Huawei Technologies Co., Ltd. 2019-2020. All rights reserved. // iSulad-kit licensed under the Mulan PSL v1. // You can use this software according to the terms and conditions of the Mulan PSL v1. // You may obtain a copy of Mulan PSL v1 at: @@ -11,7 +11,26 @@ // Author: liuhao // Create: 2019-07-12 -// To regenerate api.pb.go run hack/update-generated-runtime.sh +// Since some of this code is derived from Kubernetes, their copyright +// is retained here.... +// +// Copyright 2018 The Kubernetes 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. + +// The original version of this proto can be found at +// https://github.com/cri-o/cri-o/blob/master/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto + syntax = 'proto3'; package isula; -- GitLab