!105 convert patches into unix format
From: @fundawang Reviewed-by: @xu_lei_123 Signed-off-by: @xu_lei_123
This commit is contained in:
openeuler-ci-bot
Gitee
commit
9c2cea6de3
@ -1,69 +1,69 @@
|
||||
From 5d9e13bc8453c856f055769008dac9311f43c265 Mon Sep 17 00:00:00 2001
|
||||
From: Bjorn Neergaard <bjorn.neergaard@docker.com>
|
||||
Date: Mon, 26 Feb 2024 10:25:08 -0700
|
||||
Subject: [PATCH] api: omit missing Created field from ImageInspect response
|
||||
|
||||
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
|
||||
---
|
||||
api/swagger.yaml | 6 +++++-
|
||||
api/types/types.go | 6 +++++-
|
||||
docs/api/v1.44.yaml | 6 +++++-
|
||||
3 files changed, 15 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/api/swagger.yaml b/api/swagger.yaml
|
||||
index e55a76f..350d37a 100644
|
||||
--- a/api/swagger.yaml
|
||||
+++ b/api/swagger.yaml
|
||||
@@ -1743,8 +1743,12 @@ definitions:
|
||||
description: |
|
||||
Date and time at which the image was created, formatted in
|
||||
[RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format with nano-seconds.
|
||||
+
|
||||
+ This information is only available if present in the image,
|
||||
+ and omitted otherwise.
|
||||
type: "string"
|
||||
- x-nullable: false
|
||||
+ format: "dateTime"
|
||||
+ x-nullable: true
|
||||
example: "2022-02-04T21:20:12.497794809Z"
|
||||
Container:
|
||||
description: |
|
||||
diff --git a/api/types/types.go b/api/types/types.go
|
||||
index 5c56a0c..3c1f69a 100644
|
||||
--- a/api/types/types.go
|
||||
+++ b/api/types/types.go
|
||||
@@ -72,8 +72,12 @@ type ImageInspect struct {
|
||||
|
||||
// Created is the date and time at which the image was created, formatted in
|
||||
// RFC 3339 nano-seconds (time.RFC3339Nano).
|
||||
- Created string
|
||||
|
||||
+ //
|
||||
+ // This information is only available if present in the image,
|
||||
+ // and omitted otherwise.
|
||||
+ Created string `json:",omitempty"`
|
||||
+
|
||||
// Container is the ID of the container that was used to create the image.
|
||||
//
|
||||
// Depending on how the image was created, this field may be empty.
|
||||
diff --git a/docs/api/v1.44.yaml b/docs/api/v1.44.yaml
|
||||
index e55a76f..350d37a 100644
|
||||
--- a/docs/api/v1.44.yaml
|
||||
+++ b/docs/api/v1.44.yaml
|
||||
@@ -1743,8 +1743,12 @@ definitions:
|
||||
description: |
|
||||
Date and time at which the image was created, formatted in
|
||||
[RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format with nano-seconds.
|
||||
+
|
||||
+ This information is only available if present in the image,
|
||||
+ and omitted otherwise.
|
||||
type: "string"
|
||||
- x-nullable: false
|
||||
+ format: "dateTime"
|
||||
+ x-nullable: true
|
||||
example: "2022-02-04T21:20:12.497794809Z"
|
||||
Container:
|
||||
description: |
|
||||
--
|
||||
2.41.0
|
||||
|
||||
From 5d9e13bc8453c856f055769008dac9311f43c265 Mon Sep 17 00:00:00 2001
|
||||
From: Bjorn Neergaard <bjorn.neergaard@docker.com>
|
||||
Date: Mon, 26 Feb 2024 10:25:08 -0700
|
||||
Subject: [PATCH] api: omit missing Created field from ImageInspect response
|
||||
|
||||
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
|
||||
---
|
||||
api/swagger.yaml | 6 +++++-
|
||||
api/types/types.go | 6 +++++-
|
||||
docs/api/v1.44.yaml | 6 +++++-
|
||||
3 files changed, 15 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/api/swagger.yaml b/api/swagger.yaml
|
||||
index e55a76f..350d37a 100644
|
||||
--- a/api/swagger.yaml
|
||||
+++ b/api/swagger.yaml
|
||||
@@ -1743,8 +1743,12 @@ definitions:
|
||||
description: |
|
||||
Date and time at which the image was created, formatted in
|
||||
[RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format with nano-seconds.
|
||||
+
|
||||
+ This information is only available if present in the image,
|
||||
+ and omitted otherwise.
|
||||
type: "string"
|
||||
- x-nullable: false
|
||||
+ format: "dateTime"
|
||||
+ x-nullable: true
|
||||
example: "2022-02-04T21:20:12.497794809Z"
|
||||
Container:
|
||||
description: |
|
||||
diff --git a/api/types/types.go b/api/types/types.go
|
||||
index 5c56a0c..3c1f69a 100644
|
||||
--- a/api/types/types.go
|
||||
+++ b/api/types/types.go
|
||||
@@ -72,8 +72,12 @@ type ImageInspect struct {
|
||||
|
||||
// Created is the date and time at which the image was created, formatted in
|
||||
// RFC 3339 nano-seconds (time.RFC3339Nano).
|
||||
- Created string
|
||||
|
||||
+ //
|
||||
+ // This information is only available if present in the image,
|
||||
+ // and omitted otherwise.
|
||||
+ Created string `json:",omitempty"`
|
||||
+
|
||||
// Container is the ID of the container that was used to create the image.
|
||||
//
|
||||
// Depending on how the image was created, this field may be empty.
|
||||
diff --git a/docs/api/v1.44.yaml b/docs/api/v1.44.yaml
|
||||
index e55a76f..350d37a 100644
|
||||
--- a/docs/api/v1.44.yaml
|
||||
+++ b/docs/api/v1.44.yaml
|
||||
@@ -1743,8 +1743,12 @@ definitions:
|
||||
description: |
|
||||
Date and time at which the image was created, formatted in
|
||||
[RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format with nano-seconds.
|
||||
+
|
||||
+ This information is only available if present in the image,
|
||||
+ and omitted otherwise.
|
||||
type: "string"
|
||||
- x-nullable: false
|
||||
+ format: "dateTime"
|
||||
+ x-nullable: true
|
||||
example: "2022-02-04T21:20:12.497794809Z"
|
||||
Container:
|
||||
description: |
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
||||
@ -1,51 +1,51 @@
|
||||
From 9ee331235a3affa082d5cb0028351182b89fd123 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= <pawel.gronowski@docker.com>
|
||||
Date: Thu, 22 Feb 2024 11:14:27 +0100
|
||||
Subject: [PATCH] integration: Add container.Output utility
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Extracted from https://github.com/moby/moby/commit/bfb810445c3c111478f5e0e6268ef334c38f38cf
|
||||
|
||||
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
|
||||
---
|
||||
integration/internal/container/container.go | 25 +++++++++++++++++++++
|
||||
1 file changed, 25 insertions(+)
|
||||
|
||||
diff --git a/integration/internal/container/container.go b/integration/internal/container/container.go
|
||||
index 0974ce6bf1..dac52999ae 100644
|
||||
--- a/integration/internal/container/container.go
|
||||
+++ b/integration/internal/container/container.go
|
||||
@@ -170,3 +170,28 @@ func Inspect(ctx context.Context, t *testing.T, apiClient client.APIClient, cont
|
||||
|
||||
return c
|
||||
}
|
||||
+
|
||||
+type ContainerOutput struct {
|
||||
+ Stdout, Stderr string
|
||||
+}
|
||||
+
|
||||
+// Output waits for the container to end running and returns its output.
|
||||
+func Output(ctx context.Context, client client.APIClient, id string) (ContainerOutput, error) {
|
||||
+ logs, err := client.ContainerLogs(ctx, id, container.LogsOptions{Follow: true, ShowStdout: true, ShowStderr: true})
|
||||
+ if err != nil {
|
||||
+ return ContainerOutput{}, err
|
||||
+ }
|
||||
+
|
||||
+ defer logs.Close()
|
||||
+
|
||||
+ var stdoutBuf, stderrBuf bytes.Buffer
|
||||
+ _, err = stdcopy.StdCopy(&stdoutBuf, &stderrBuf, logs)
|
||||
+ if err != nil {
|
||||
+ return ContainerOutput{}, err
|
||||
+ }
|
||||
+
|
||||
+ return ContainerOutput{
|
||||
+ Stdout: stdoutBuf.String(),
|
||||
+ Stderr: stderrBuf.String(),
|
||||
+ }, nil
|
||||
+}
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From 9ee331235a3affa082d5cb0028351182b89fd123 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= <pawel.gronowski@docker.com>
|
||||
Date: Thu, 22 Feb 2024 11:14:27 +0100
|
||||
Subject: [PATCH] integration: Add container.Output utility
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Extracted from https://github.com/moby/moby/commit/bfb810445c3c111478f5e0e6268ef334c38f38cf
|
||||
|
||||
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
|
||||
---
|
||||
integration/internal/container/container.go | 25 +++++++++++++++++++++
|
||||
1 file changed, 25 insertions(+)
|
||||
|
||||
diff --git a/integration/internal/container/container.go b/integration/internal/container/container.go
|
||||
index 0974ce6bf1..dac52999ae 100644
|
||||
--- a/integration/internal/container/container.go
|
||||
+++ b/integration/internal/container/container.go
|
||||
@@ -170,3 +170,28 @@ func Inspect(ctx context.Context, t *testing.T, apiClient client.APIClient, cont
|
||||
|
||||
return c
|
||||
}
|
||||
+
|
||||
+type ContainerOutput struct {
|
||||
+ Stdout, Stderr string
|
||||
+}
|
||||
+
|
||||
+// Output waits for the container to end running and returns its output.
|
||||
+func Output(ctx context.Context, client client.APIClient, id string) (ContainerOutput, error) {
|
||||
+ logs, err := client.ContainerLogs(ctx, id, container.LogsOptions{Follow: true, ShowStdout: true, ShowStderr: true})
|
||||
+ if err != nil {
|
||||
+ return ContainerOutput{}, err
|
||||
+ }
|
||||
+
|
||||
+ defer logs.Close()
|
||||
+
|
||||
+ var stdoutBuf, stderrBuf bytes.Buffer
|
||||
+ _, err = stdcopy.StdCopy(&stdoutBuf, &stderrBuf, logs)
|
||||
+ if err != nil {
|
||||
+ return ContainerOutput{}, err
|
||||
+ }
|
||||
+
|
||||
+ return ContainerOutput{
|
||||
+ Stdout: stdoutBuf.String(),
|
||||
+ Stderr: stderrBuf.String(),
|
||||
+ }, nil
|
||||
+}
|
||||
--
|
||||
2.33.0
|
||||
|
||||
|
||||
@ -1,37 +1,37 @@
|
||||
From a72294a6688d747dcfec8751c3e2616cad703a31 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= <pawel.gronowski@docker.com>
|
||||
Date: Mon, 19 Feb 2024 15:16:07 +0100
|
||||
Subject: [PATCH] mounts/validate: Don't check source exists with
|
||||
CreateMountpoint
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Don't error out when mount source doesn't exist and mounts has
|
||||
`CreateMountpoint` option enabled.
|
||||
|
||||
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
|
||||
(cherry picked from commit 05b883bdc836a2fd621452f58a2a2c02d253718c)
|
||||
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
|
||||
---
|
||||
volume/mounts/linux_parser.go | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/volume/mounts/linux_parser.go b/volume/mounts/linux_parser.go
|
||||
index 1b64c23935..e7e8ad80f3 100644
|
||||
--- a/volume/mounts/linux_parser.go
|
||||
+++ b/volume/mounts/linux_parser.go
|
||||
@@ -85,7 +85,9 @@ func (p *linuxParser) validateMountConfigImpl(mnt *mount.Mount, validateBindSour
|
||||
if err != nil {
|
||||
return &errMountConfig{mnt, err}
|
||||
}
|
||||
- if !exists {
|
||||
+
|
||||
+ createMountpoint := mnt.BindOptions != nil && mnt.BindOptions.CreateMountpoint
|
||||
+ if !exists && !createMountpoint {
|
||||
return &errMountConfig{mnt, errBindSourceDoesNotExist(mnt.Source)}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From a72294a6688d747dcfec8751c3e2616cad703a31 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= <pawel.gronowski@docker.com>
|
||||
Date: Mon, 19 Feb 2024 15:16:07 +0100
|
||||
Subject: [PATCH] mounts/validate: Don't check source exists with
|
||||
CreateMountpoint
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Don't error out when mount source doesn't exist and mounts has
|
||||
`CreateMountpoint` option enabled.
|
||||
|
||||
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
|
||||
(cherry picked from commit 05b883bdc836a2fd621452f58a2a2c02d253718c)
|
||||
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
|
||||
---
|
||||
volume/mounts/linux_parser.go | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/volume/mounts/linux_parser.go b/volume/mounts/linux_parser.go
|
||||
index 1b64c23935..e7e8ad80f3 100644
|
||||
--- a/volume/mounts/linux_parser.go
|
||||
+++ b/volume/mounts/linux_parser.go
|
||||
@@ -85,7 +85,9 @@ func (p *linuxParser) validateMountConfigImpl(mnt *mount.Mount, validateBindSour
|
||||
if err != nil {
|
||||
return &errMountConfig{mnt, err}
|
||||
}
|
||||
- if !exists {
|
||||
+
|
||||
+ createMountpoint := mnt.BindOptions != nil && mnt.BindOptions.CreateMountpoint
|
||||
+ if !exists && !createMountpoint {
|
||||
return &errMountConfig{mnt, errBindSourceDoesNotExist(mnt.Source)}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.33.0
|
||||
|
||||
|
||||
@ -7,9 +7,9 @@
|
||||
|
||||
Name: moby
|
||||
Version: 25.0.3
|
||||
Release: 20
|
||||
Release: 21
|
||||
Summary: The open-source application container engine
|
||||
License: ASL 2.0
|
||||
License: Apache-2.0
|
||||
URL: https://www.docker.com
|
||||
# https://github.com/docker/cli/archive/refs/tags/v25.0.3.tar.gz
|
||||
Source0: cli-%{version}.tar.gz
|
||||
@ -224,6 +224,9 @@ fi
|
||||
%systemd_postun_with_restart docker.service
|
||||
|
||||
%changelog
|
||||
* Fri Nov 29 2024 Funda Wang <fundawang@yeah.net> - 25.0.3-21
|
||||
- convert patches into unix format
|
||||
|
||||
* Fri Nov 22 2024 Funda Wang <fundawang@yeah.net> - 25.0.3-20
|
||||
- rename back to moby
|
||||
- split docker-proxy for docker 18 to use
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user