sync patches from upstream
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
This commit is contained in:
parent
3714e00bf1
commit
fe22cb8a0b
@ -0,0 +1,56 @@
|
|||||||
|
From 91c988d01b96ba31ac495228a17644aa4aab47c9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: haozi007 <liuhao27@huawei.com>
|
||||||
|
Date: Tue, 22 Mar 2022 07:24:11 +0000
|
||||||
|
Subject: [PATCH 2/3] add rename json schema for rename subcommand in restful
|
||||||
|
mode
|
||||||
|
|
||||||
|
Signed-off-by: haozi007 <liuhao27@huawei.com>
|
||||||
|
---
|
||||||
|
src/json/schema/container/rename-request.json | 12 ++++++++++++
|
||||||
|
src/json/schema/container/rename-response.json | 15 +++++++++++++++
|
||||||
|
2 files changed, 27 insertions(+)
|
||||||
|
create mode 100644 src/json/schema/container/rename-request.json
|
||||||
|
create mode 100644 src/json/schema/container/rename-response.json
|
||||||
|
|
||||||
|
diff --git a/src/json/schema/container/rename-request.json b/src/json/schema/container/rename-request.json
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..35a6bd3
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/json/schema/container/rename-request.json
|
||||||
|
@@ -0,0 +1,12 @@
|
||||||
|
+{
|
||||||
|
+ "$schema": "http://json-schema.org/draft-04/schema#",
|
||||||
|
+ "type": "object",
|
||||||
|
+ "properties": {
|
||||||
|
+ "old-name": {
|
||||||
|
+ "type": "string"
|
||||||
|
+ },
|
||||||
|
+ "new-name": {
|
||||||
|
+ "type": "string"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
diff --git a/src/json/schema/container/rename-response.json b/src/json/schema/container/rename-response.json
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..048f43d
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/json/schema/container/rename-response.json
|
||||||
|
@@ -0,0 +1,15 @@
|
||||||
|
+{
|
||||||
|
+ "$schema": "http://json-schema.org/draft-04/schema#",
|
||||||
|
+ "type": "object",
|
||||||
|
+ "properties": {
|
||||||
|
+ "id": {
|
||||||
|
+ "type": "string"
|
||||||
|
+ },
|
||||||
|
+ "cc": {
|
||||||
|
+ "type": "uint32"
|
||||||
|
+ },
|
||||||
|
+ "errmsg": {
|
||||||
|
+ "type": "string"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
54
0003-Add-restful-interface-isula-pull.patch
Normal file
54
0003-Add-restful-interface-isula-pull.patch
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
From be04a305d16c91bb05011a9b8e88ec41f1a5f90e Mon Sep 17 00:00:00 2001
|
||||||
|
From: "yanshui.li" <yanshuili.lys@gmail.com>
|
||||||
|
Date: Fri, 25 Mar 2022 03:04:59 +0000
|
||||||
|
Subject: [PATCH 3/3] Add restful interface isula pull
|
||||||
|
|
||||||
|
---
|
||||||
|
src/json/schema/image/pull-image-request.json | 9 +++++++++
|
||||||
|
src/json/schema/image/pull-image-response.json | 18 ++++++++++++++++++
|
||||||
|
2 files changed, 27 insertions(+)
|
||||||
|
create mode 100644 src/json/schema/image/pull-image-request.json
|
||||||
|
create mode 100644 src/json/schema/image/pull-image-response.json
|
||||||
|
|
||||||
|
diff --git a/src/json/schema/image/pull-image-request.json b/src/json/schema/image/pull-image-request.json
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..a1d81a7
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/json/schema/image/pull-image-request.json
|
||||||
|
@@ -0,0 +1,9 @@
|
||||||
|
+{
|
||||||
|
+ "$schema": "http://json-schema.org/draft-04/schema#",
|
||||||
|
+ "type": "object",
|
||||||
|
+ "properties": {
|
||||||
|
+ "image_name": {
|
||||||
|
+ "type": "string"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
diff --git a/src/json/schema/image/pull-image-response.json b/src/json/schema/image/pull-image-response.json
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..86c429a
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/json/schema/image/pull-image-response.json
|
||||||
|
@@ -0,0 +1,18 @@
|
||||||
|
+{
|
||||||
|
+ "$schema": "http://json-schema.org/draft-04/schema#",
|
||||||
|
+ "type": "object",
|
||||||
|
+ "properties": {
|
||||||
|
+ "image_ref": {
|
||||||
|
+ "type": "string"
|
||||||
|
+ },
|
||||||
|
+ "cc": {
|
||||||
|
+ "type": "uint32"
|
||||||
|
+ },
|
||||||
|
+ "server_errono": {
|
||||||
|
+ "type": "uint32"
|
||||||
|
+ },
|
||||||
|
+ "errmsg": {
|
||||||
|
+ "type": "string"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
10
lcr.spec
10
lcr.spec
@ -1,5 +1,5 @@
|
|||||||
%global _version 2.0.7
|
%global _version 2.0.7
|
||||||
%global _release 2
|
%global _release 3
|
||||||
%global _inner_name isula_libutils
|
%global _inner_name isula_libutils
|
||||||
|
|
||||||
Name: lcr
|
Name: lcr
|
||||||
@ -13,6 +13,8 @@ License: LGPLv2.1+
|
|||||||
BuildRoot: %{_tmppath}/lcr-%{version}
|
BuildRoot: %{_tmppath}/lcr-%{version}
|
||||||
|
|
||||||
Patch0001: 0001-parse-userns-remap-in-daemmon.json.patch
|
Patch0001: 0001-parse-userns-remap-in-daemmon.json.patch
|
||||||
|
Patch0002: 0002-add-rename-json-schema-for-rename-subcommand-in-rest.patch
|
||||||
|
Patch0003: 0003-Add-restful-interface-isula-pull.patch
|
||||||
|
|
||||||
%define lxcver 4.0.3-2021112501
|
%define lxcver 4.0.3-2021112501
|
||||||
|
|
||||||
@ -101,6 +103,12 @@ rm -rf %{buildroot}
|
|||||||
%{_includedir}/%{_inner_name}/*.h
|
%{_includedir}/%{_inner_name}/*.h
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Apr 18 2022 wangfengtu <wangfengtu@huawei.com> - 2.0.7-3
|
||||||
|
- Type:enhancement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC: sync patches from upstream
|
||||||
|
|
||||||
* Wed Mar 02 2022 wangfengtu <wangfengtu@huawei.com> - 2.0.7-2
|
* Wed Mar 02 2022 wangfengtu <wangfengtu@huawei.com> - 2.0.7-2
|
||||||
- Type:enhancement
|
- Type:enhancement
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user