Merge pull request #35348 from thaJeztah/bump-selinux
bump opencontainers/selinux to b29023b86e4a69d1b46b7e7b4e2b6fda03f0b9cd
diff --git a/api/errdefs/is.go b/api/errdefs/is.go
index ce574cd..b0be0b8 100644
--- a/api/errdefs/is.go
+++ b/api/errdefs/is.go
@@ -25,7 +25,7 @@
}
}
-// IsNotFound returns if the passed in error is a ErrNotFound
+// IsNotFound returns if the passed in error is an ErrNotFound
func IsNotFound(err error) bool {
_, ok := getImplementer(err).(ErrNotFound)
return ok
@@ -37,7 +37,7 @@
return ok
}
-// IsConflict returns if the passed in error is a ErrConflict
+// IsConflict returns if the passed in error is an ErrConflict
func IsConflict(err error) bool {
_, ok := getImplementer(err).(ErrConflict)
return ok
@@ -55,13 +55,13 @@
return ok
}
-// IsForbidden returns if the passed in error is a ErrForbidden
+// IsForbidden returns if the passed in error is an ErrForbidden
func IsForbidden(err error) bool {
_, ok := getImplementer(err).(ErrForbidden)
return ok
}
-// IsSystem returns if the passed in error is a ErrSystem
+// IsSystem returns if the passed in error is an ErrSystem
func IsSystem(err error) bool {
_, ok := getImplementer(err).(ErrSystem)
return ok
@@ -73,7 +73,7 @@
return ok
}
-// IsNotImplemented returns if the passed in error is a ErrNotImplemented
+// IsNotImplemented returns if the passed in error is an ErrNotImplemented
func IsNotImplemented(err error) bool {
_, ok := getImplementer(err).(ErrNotImplemented)
return ok
diff --git a/api/swagger.yaml b/api/swagger.yaml
index 80319ae..2106c31 100644
--- a/api/swagger.yaml
+++ b/api/swagger.yaml
@@ -19,10 +19,10 @@
consumes:
- "application/json"
- "text/plain"
-basePath: "/v1.34"
+basePath: "/v1.35"
info:
title: "Docker Engine API"
- version: "1.34"
+ version: "1.35"
x-logo:
url: "https://docs.docker.com/images/logo-docker-main.png"
description: |
@@ -42,22 +42,32 @@
# Versioning
- The API is usually changed in each release of Docker, so API calls are versioned to ensure that clients don't break.
+ The API is usually changed in each release, so API calls are versioned to
+ ensure that clients don't break. To lock to a specific version of the API,
+ you prefix the URL with its version, for example, call `/v1.30/info` to use
+ the v1.30 version of the `/info` endpoint. If the API version specified in
+ the URL is not supported by the daemon, a HTTP `400 Bad Request` error message
+ is returned.
- For Docker Engine 17.10, the API version is 1.33. To lock to this version, you prefix the URL with `/v1.33`. For example, calling `/info` is the same as calling `/v1.33/info`.
+ If you omit the version-prefix, the current version of the API (v1.35) is used.
+ For example, calling `/info` is the same as calling `/v1.35/info`. Using the
+ API without a version-prefix is deprecated and will be removed in a future release.
- Engine releases in the near future should support this version of the API, so your client will continue to work even if it is talking to a newer Engine.
+ Engine releases in the near future should support this version of the API,
+ so your client will continue to work even if it is talking to a newer Engine.
- In previous versions of Docker, it was possible to access the API without providing a version. This behaviour is now deprecated will be removed in a future version of Docker.
+ The API uses an open schema model, which means server may add extra properties
+ to responses. Likewise, the server will ignore any extra query parameters and
+ request body properties. When you write clients, you need to ignore additional
+ properties in responses to ensure they do not break when talking to newer
+ daemons.
- If the API version specified in the URL is not supported by the daemon, a HTTP `400 Bad Request` error message is returned.
-
- The API uses an open schema model, which means server may add extra properties to responses. Likewise, the server will ignore any extra query parameters and request body properties. When you write clients, you need to ignore additional properties in responses to ensure they do not break when talking to newer Docker daemons.
-
- This documentation is for version 1.34 of the API. Use this table to find documentation for previous versions of the API:
+ This documentation is for version v1.35 of the API. Use this table to find
+ documentation for previous versions of the API:
Docker version | API version | Changes
----------------|-------------|---------
+ 17.11.x | [1.34](https://docs.docker.com/engine/api/v1.34/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-34-api-changes)
17.10.x | [1.33](https://docs.docker.com/engine/api/v1.33/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-33-api-changes)
17.09.x | [1.32](https://docs.docker.com/engine/api/v1.32/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-32-api-changes)
17.07.x | [1.31](https://docs.docker.com/engine/api/v1.31/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-31-api-changes)
diff --git a/builder/remotecontext/archive.go b/builder/remotecontext/archive.go
index fc18c5d..b62d9dd 100644
--- a/builder/remotecontext/archive.go
+++ b/builder/remotecontext/archive.go
@@ -122,8 +122,5 @@
if err != nil {
return "", "", errors.Wrapf(err, "forbidden path outside the build context: %s (%s)", path, cleanPath)
}
- if _, err := root.Lstat(fullPath); err != nil {
- return "", "", errors.WithStack(convertPathError(err, path))
- }
return
}
diff --git a/builder/remotecontext/lazycontext.go b/builder/remotecontext/lazycontext.go
index 66f36de..08b8058 100644
--- a/builder/remotecontext/lazycontext.go
+++ b/builder/remotecontext/lazycontext.go
@@ -40,16 +40,18 @@
return "", err
}
- fi, err := c.root.Lstat(fullPath)
- if err != nil {
- return "", errors.WithStack(err)
- }
-
relPath, err := Rel(c.root, fullPath)
if err != nil {
return "", errors.WithStack(convertPathError(err, cleanPath))
}
+ fi, err := os.Lstat(fullPath)
+ if err != nil {
+ // Backwards compatibility: a missing file returns a path as hash.
+ // This is reached in the case of a broken symlink.
+ return relPath, nil
+ }
+
sum, ok := c.sums[relPath]
if !ok {
sum, err = c.prepareHash(relPath, fi)
diff --git a/builder/remotecontext/tarsum_test.go b/builder/remotecontext/tarsum_test.go
index 6d2b41d..9395460 100644
--- a/builder/remotecontext/tarsum_test.go
+++ b/builder/remotecontext/tarsum_test.go
@@ -104,17 +104,6 @@
}
}
-func TestStatNotExisting(t *testing.T) {
- contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
- defer cleanup()
-
- src := makeTestArchiveContext(t, contextDir)
- _, err := src.Hash("not-existing")
- if !os.IsNotExist(errors.Cause(err)) {
- t.Fatalf("This file should not exist: %s", err)
- }
-}
-
func TestRemoveDirectory(t *testing.T) {
contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
defer cleanup()
@@ -129,17 +118,20 @@
src := makeTestArchiveContext(t, contextDir)
- tarSum := src.(modifiableContext)
+ _, err = src.Root().Stat(src.Root().Join(src.Root().Path(), relativePath))
+ if err != nil {
+ t.Fatalf("Statting %s shouldn't fail: %+v", relativePath, err)
+ }
+ tarSum := src.(modifiableContext)
err = tarSum.Remove(relativePath)
if err != nil {
t.Fatalf("Error when executing Remove: %s", err)
}
- _, err = src.Hash(contextSubdir)
-
+ _, err = src.Root().Stat(src.Root().Join(src.Root().Path(), relativePath))
if !os.IsNotExist(errors.Cause(err)) {
- t.Fatal("Directory should not exist at this point")
+ t.Fatalf("Directory should not exist at this point: %+v ", err)
}
}
diff --git a/docs/api/version-history.md b/docs/api/version-history.md
index 77b8545..6ff5338 100644
--- a/docs/api/version-history.md
+++ b/docs/api/version-history.md
@@ -13,6 +13,9 @@
will be rejected.
-->
+## v1.35 API changes
+
+
## v1.34 API changes
[Docker Engine API v1.34](https://docs.docker.com/engine/api/v1.34/) documentation
diff --git a/hack/dockerfile/install-binaries.sh b/hack/dockerfile/install-binaries.sh
index 0a45ef9..e97385e 100755
--- a/hack/dockerfile/install-binaries.sh
+++ b/hack/dockerfile/install-binaries.sh
@@ -34,7 +34,21 @@
git checkout -q "$CONTAINERD_COMMIT"
(
export GOPATH
- make $1
+ make
+ )
+ cp bin/containerd /usr/local/bin/docker-containerd
+ cp bin/containerd-shim /usr/local/bin/docker-containerd-shim
+ cp bin/ctr /usr/local/bin/docker-containerd-ctr
+}
+
+install_containerd_static() {
+ echo "Install containerd version $CONTAINERD_COMMIT"
+ git clone https://github.com/containerd/containerd.git "$GOPATH/src/github.com/containerd/containerd"
+ cd "$GOPATH/src/github.com/containerd/containerd"
+ git checkout -q "$CONTAINERD_COMMIT"
+ (
+ export GOPATH
+ make EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\""
)
cp bin/containerd /usr/local/bin/docker-containerd
cp bin/containerd-shim /usr/local/bin/docker-containerd-shim
@@ -106,7 +120,7 @@
;;
containerd)
- install_containerd
+ install_containerd_static
;;
containerd-dynamic)
