profile
viewpoint
Andrew Hsu andrewhsu @docker San Francisco, CA https://andrewhsu.github.io Engineering Manager @docker

delete branch andrewhsu/docker-ce

delete branch : 1903ga

delete time in 8 days

push eventdocker/docker-ce

Andrew Hsu

commit sha cd61b7839661971a12f62f1f2747020d18c1480f

bump ver 19.03.5 Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

view details

Andrew Hsu

commit sha 633a0ea838f10e000b7c6d6eed1623e6e988b5bb

Merge pull request #637 from andrewhsu/1903ga [19.03] bump ver 19.03.5

view details

push time in 8 days

PR merged docker/docker-ce

Reviewers
[19.03] bump ver 19.03.5

bump ver

+3 -2

1 comment

2 changed files

andrewhsu

pr closed time in 8 days

pull request commentdocker/docker-ce

[19.03] bump ver 19.03.5

Merging to get builds going.

andrewhsu

comment created time in 8 days

push eventandrewhsu/docker-ce

Tonis Tiigi

commit sha 44aa687b7e55dbe338b70a6af38c3a21cc2ed69d

vendor: update buildkit to 928f3b48 Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Upstream-commit: 33b2719488ec44196846ef61c4887a784edca081 Component: engine

view details

Andrew Hsu

commit sha 78173b207025733b91599a3ea9a5ef365fd956be

Merge pull request #422 from tonistiigi/1903-update-buildkit [19.03] vendor: update buildkit to 928f3b48 Upstream-commit: ea84732a77251e0d7af278e2b7df1d6a59fca46b Component: engine

view details

GordonTheTurtle

commit sha 50c71c735cdd28bc437d8f99694034f816fd1a45

Merge component 'engine' from git@github.com:docker/engine 19.03

view details

Andrew Hsu

commit sha cd61b7839661971a12f62f1f2747020d18c1480f

bump ver 19.03.5 Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

view details

push time in 8 days

startedlucas-clemente/quic-go

started time in 8 days

push eventandrewhsu/docker-ce

Andrew Hsu

commit sha 1eef12cea9d4ead0348c0174f682f15911694faa

bump ver 19.03.5 Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

view details

push time in 8 days

push eventdocker/engine

Tonis Tiigi

commit sha 33b2719488ec44196846ef61c4887a784edca081

vendor: update buildkit to 928f3b48 Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

view details

Andrew Hsu

commit sha ea84732a77251e0d7af278e2b7df1d6a59fca46b

Merge pull request #422 from tonistiigi/1903-update-buildkit [19.03] vendor: update buildkit to 928f3b48

view details

push time in 8 days

PR merged docker/engine

[19.03] vendor: update buildkit to 928f3b48 impact/changelog

Brings in: https://github.com/moby/buildkit/pull/1257 cache: fix possible concurrent maps write on parent release

Signed-off-by: Tonis Tiigi tonistiigi@gmail.com

+5 -7

0 comment

2 changed files

tonistiigi

pr closed time in 8 days

PR opened docker/docker-ce

Reviewers
[19.03] bump ver 19.03.5

bump ver

+2 -2

0 comment

2 changed files

pr created time in 9 days

create barnchandrewhsu/docker-ce

branch : 1903ga

created branch time in 9 days

delete branch andrewhsu/docker-ce

delete branch : 1903b1

delete time in 9 days

issue commentdocker/for-linux

dockerd: high memory usage

@ceecko could you provide steps to reproduce? With current description of the issue, hard to nail down what is happening on your system.

ceecko

comment created time in 9 days

issue closeddocker/for-linux

Upload gpg key to keyservers

<!-- This issue tracker is for bug reports and feature requests. For questions, and getting help on using docker:

  • Docker documentation - https://docs.docker.com
  • Docker Forums - https://forums.docker.com
  • Docker community Slack - https://dockercommunity.slack.com/ (register here: http://dockr.ly/community)
  • Post a question on StackOverflow, using the Docker tag -->
  • [] This is a bug report
  • [x ] This is a feature request
  • [ ] I searched existing issues before opening this one

<!-- DO NOT report security issues publicly! If you suspect you discovered a security issue, send your report privately to security@docker.com. --> Hi,

Can the docker team please upload their gpg public key to a keyserver to facilitate its users in cross-checking the validity of the key when importing it for the first-time?

I downloaded the docker gpg key from the following URL:

  • https://download.docker.com/linux/centos/gpg

That gave me a key with fingerprint 060A 61C5 1B55 8A7F 742B 77AA C52F EB6B 621E 9F35 and a uid for docker@docker.com

user@personal:~$ gpg --list-keys docker
pub   rsa4096/0xC52FEB6B621E9F35 2017-02-22 [SCEA]
      Key fingerprint = 060A 61C5 1B55 8A7F 742B  77AA C52F EB6B 621E 9F35
uid                   [ unknown] Docker Release (CE rpm) <docker@docker.com>

user@personal:~$ 

But then I went to validate that this key was indeed correct, and I was stunned to find that it isn't listed on the sks keyservers or the better/replacement keyserver https://keys.openpgp.org/

  • https://keys.openpgp.org/search?q=docker%40docker.com

Moreover, there's no non-self signatures on the key

user@disp4086:~$ curl  --tlsv1.2 --proto =https --location https://download.docker.com/linux/centos/gpg > docker.gpg
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  1627  100  1627    0     0    668      0  0:00:02  0:00:02 --:--:--   668
user@disp4086:~$ cat docker.gpg | gpg --list-packets
gpg: keybox '/home/user/.gnupg/pubring.kbx' created
# off=0 ctb=99 tag=6 hlen=3 plen=525
:public key packet:
	version 4, algo 1, created 1487791233, expires 0
	pkey[0]: [4096 bits]
	pkey[1]: [17 bits]
	keyid: C52FEB6B621E9F35
# off=528 ctb=b4 tag=13 hlen=2 plen=43
:user ID packet: "Docker Release (CE rpm) <docker@docker.com>"
# off=573 ctb=89 tag=2 hlen=3 plen=567
:signature packet: algo 1, keyid C52FEB6B621E9F35
	version 4, created 1487792760, md5len 0, sigclass 0x13
	digest algo 10, begin of digest e8 2d
	hashed subpkt 2 len 4 (sig created 2017-02-22)
	hashed subpkt 27 len 1 (key flags: 2F)
	hashed subpkt 11 len 4 (pref-sym-algos: 9 8 7 3)
	hashed subpkt 21 len 4 (pref-hash-algos: 10 9 8 11)
	hashed subpkt 22 len 4 (pref-zip-algos: 2 3 1 0)
	hashed subpkt 30 len 1 (features: 01)
	hashed subpkt 23 len 1 (keyserver preferences: 80)
	subpkt 16 len 8 (issuer key ID C52FEB6B621E9F35)
	data: [4094 bits]
user@disp4086:~$ 

In-case it isn't clear, there's significant security risks with the X.509 security model used by my browser (or curl, etc) when downloading the docker gpg key from https://download.docker.com/linux/centos/gpg. HSTS is great when re-visiting a website, but the first time I visit docker.com, it wouldn't be too difficult for a malicious actor to MITM the connection with a cert signed by the extremely large list of CAs trusted by popular browsers -- which includes, for example, organizations controlled by State Actors who have a history of human rights abuses. And, historically, included many CAs that had to be removed because the CA's private key was stolen or was otherwise signing certificates that they shouldn't have been. If any cert is signed by any of those CAs, a MITM actor can send the wrong gpg key to a client, and the browser will show no indication of wrong-doing.

As suggested above, the solution to this problem is:

  1. publishing the docker public key on other domains in addition to docker.com, such as the keys.openpgp.org keyserver

  2. signing your public key with other gpg keys that are well integrated in the web of trust

The second item is a more complicated and long-term solution, so this issue is a feature request to upload the docker gpg key to the keys.openpgp.org keyserer, which should only take a few minutes to do. You'll need to click a link sent to the uid of the key (docker@docker.com) as described here https://keys.openpgp.org/about

closed time in 9 days

maltfield

issue commentdocker/for-linux

Upload gpg key to keyservers

Closing as duplicate of #602

maltfield

comment created time in 9 days

issue commentdocker/for-linux

Upload gpg key to keyservers

cc @justincormack

maltfield

comment created time in 9 days

issue commentdocker/for-linux

failed to add interface

@xupyp1 can you provide the commands you ran to get the error?

xupyp1

comment created time in 9 days

startedzmb3/spotify

started time in 11 days

startedgoproxy/goproxy

started time in 12 days

pull request commentmoby/moby

Fix docker crash when creating namespaces with UID in /etc/subuid and /etc/subgid

needs a rebase to get the new jenkinsfile to run today's PR checks. triggering of old jenkins job will not work anymore

yongtang

comment created time in 14 days

pull request commentmoby/moby

Windows: Build and use gotestsum for running all tests

This PR is valuable as is with RS5 junit test results in jenkins. It is important to expose the failures since the return code is always success.

I'd recommend getting this PR in as soon as possible and having a separate PR for RS1.

thaJeztah

comment created time in 14 days

delete branch andrewhsu/docker-ce

delete branch : 1903rc1

delete time in 15 days

push eventdocker/docker-ce

Andrew Hsu

commit sha 074ef5074a8807932b5ed6b14cce28dd1a156ab5

bump ver 19.03.5-rc1 Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

view details

Andrew Hsu

commit sha 3e4013245a8c13679ea3fb84e03490b439e99490

Merge pull request #636 from andrewhsu/1903rc1 [19.03] bump ver 19.03.5-rc1

view details

push time in 15 days

PR merged docker/docker-ce

Reviewers
[19.03] bump ver 19.03.5-rc1

bump ver

+2 -1

1 comment

2 changed files

andrewhsu

pr closed time in 15 days

pull request commentdocker/docker-ce

[19.03] bump ver 19.03.5-rc1

Merging to get builds going.

andrewhsu

comment created time in 15 days

push eventandrewhsu/docker-ce

Sebastiaan van Stijn

commit sha 6c02751cecabf6ec4f39d3ddc62c1ebc6c01be17

Revert "Revert "[19.03] bump swarmkit to f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29"" This reverts commit ef4366ee890abc587b291f7e41223a2c51e14153. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 0c38d56a6dae8c9c8379d29083b759005308ebc9 Component: engine

view details

Arko Dasgupta

commit sha a53e379675d6aec789ad4b54194bb33bb649a1fb

Add TC to check dyanmic subnet for ingress network Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com> (cherry picked from commit e2b5ac75a393f6942c37efdd888fc3bc761de244) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 12e7d99439917b44a173e5326798365870bbbc90 Component: engine

view details

Andrew Hsu

commit sha 41236fe25e43660ac3d84fea558dd5fe8083d0a3

Merge pull request #374 from thaJeztah/19.03_backport_add_tc_dynamic_ingress_network [19.03 backport] Add TC to check dynamic subnet for ingress network Upstream-commit: 075a0201b96af7c023f22341a8876a50ecc1828b Component: engine

view details

GordonTheTurtle

commit sha 4d79118906ccd70c40d1ca59a73e796fecb818a9

Merge component 'engine' from git@github.com:docker/engine 19.03

view details

Andrew Hsu

commit sha 074ef5074a8807932b5ed6b14cce28dd1a156ab5

bump ver 19.03.5-rc1 Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

view details

push time in 15 days

push eventdocker/engine

Sebastiaan van Stijn

commit sha 0c38d56a6dae8c9c8379d29083b759005308ebc9

Revert "Revert "[19.03] bump swarmkit to f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29"" This reverts commit ef4366ee890abc587b291f7e41223a2c51e14153. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Arko Dasgupta

commit sha 12e7d99439917b44a173e5326798365870bbbc90

Add TC to check dyanmic subnet for ingress network Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com> (cherry picked from commit e2b5ac75a393f6942c37efdd888fc3bc761de244) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Andrew Hsu

commit sha 075a0201b96af7c023f22341a8876a50ecc1828b

Merge pull request #374 from thaJeztah/19.03_backport_add_tc_dynamic_ingress_network [19.03 backport] Add TC to check dynamic subnet for ingress network

view details

push time in 15 days

PR merged docker/engine

[19.03 backport] Add TC to check dynamic subnet for ingress network

based on top of ~https://github.com/docker/engine/pull/281 and~ https://github.com/docker/engine/pull/376

depends on:

  • [ ] https://github.com/moby/moby/pull/39966 Add TC to check dynamic subnet for ingress network
  • [x] https://github.com/docker/engine/pull/281 [19.03 backport] Integration: change signatures to fix golint warnings
  • [x] https://github.com/docker/engine/pull/376 [19.03 backport] Fix flaky TestServiceWithDefaultAddressPoolInit

closes https://github.com/docker/engine/pull/375 (which is an alternative for this one)

Revert https://github.com/docker/engine/pull/375

brings back https://github.com/docker/engine/pull/369

full diff: https://github.com/docker/swarmkit/compare/bbe341867eae1615faf8a702ec05bfe986e73e06...f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29

changes included:

  • docker/swarmkit#2891 [19.03 backport] Remove hardcoded IPAM config subnet value for ingress network
    • backport of docker/swarmkit#2890 Remove hardcoded IPAM config subnet value for ingress network
    • fixes ENGCORE-1028 Specifying --default-addr-pool for docker swarm init is not picked up by ingress network

Backport of https://github.com/moby/moby/pull/39966 for 19.03

To fix CI being red after merging https://github.com/docker/engine/pull/369 (effectively a backport of https://github.com/moby/moby/pull/39953)

Marked as "WIP", because upstream isn't merged yet

+9 -7

5 comments

3 changed files

thaJeztah

pr closed time in 15 days

pull request commentdocker/engine

[19.03 backport] Add TC to check dynamic subnet for ingress network

known flaky failure

--- FAIL: TestDockerSwarmSuite/TestSwarmClusterRotateUnlockKey (61.38s)
thaJeztah

comment created time in 15 days

PR closed docker/engine

[19.03] Bump Swarmkit to f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29
  1. Includes: https://github.com/docker/swarmkit/pull/2891

  2. Edited TestServiceWithDefaultAddressPoolInit to validate dynamic ingress network subnet

Signed-off-by: Arko Dasgupta arko.dasgupta@docker.com

+9 -7

5 comments

3 changed files

arkodg

pr closed time in 15 days

pull request commentdocker/engine

[19.03] Bump Swarmkit to f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29

This is a duplicate of #374

arkodg

comment created time in 15 days

push eventandrewhsu/docker-ce

Andrew Hsu

commit sha a38f8a8fefdfaef720c1ca8267c5a37d794ab2bd

bump ver 19.03.5-rc1 Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

view details

push time in 15 days

startedmitchellh/gon

started time in 15 days

issue openedmoby/moby

run integration tests with selinux enabled

Currently, we're running tests without selinux enabled. Would be good to make sure stuff still goes with selinux enabled.

created time in 16 days

PR opened docker/docker-ce

Reviewers
[19.03] bump ver 19.03.5-rc1

bump ver

+1 -1

0 comment

1 changed file

pr created time in 16 days

create barnchandrewhsu/docker-ce

branch : 1903rc1

created branch time in 16 days

issue commentdocker/for-linux

unregister_netdevice waiting for IO

Hmm...looks like this moby issue has similar message about unregister_netdevice: https://github.com/moby/moby/issues/5618

zakikhani

comment created time in 16 days

issue closeddocker/for-linux

Docker build doesn't print the overridden value with --build-arg

<!-- This issue tracker is for bug reports and feature requests. For questions, and getting help on using docker:

  • Docker documentation - https://docs.docker.com
  • Docker Forums - https://forums.docker.com
  • Docker community Slack - https://dockercommunity.slack.com/ (register here: http://dockr.ly/community)
  • Post a question on StackOverflow, using the Docker tag -->
  • [x] This is a bug report
  • [ ] This is a feature request
  • [ ] I searched existing issues before opening this one

<!-- DO NOT report security issues publicly! If you suspect you discovered a security issue, send your report privately to security@docker.com. -->

Expected behavior

I have a Dockerfile with the following lines:

ARG PARENT=asdf.dkr.ecr.us-west-2.amazonaws.com/base:latest
FROM ${PARENT}

Sometimes I want to build this with a different PARENT, for which I add the following command line option: --build-arg PARENT=tests_base:33053_88719

I expect Docker to print variables according to this override,

Actual behavior

but this is what actually happens:

12:31:31  ---> 95a664e8bec8
12:31:32 Successfully built 95a664e8bec8
12:31:32 Successfully tagged tests_base:33053_89232
12:31:32 Building docker image tests:33053_89232
12:31:41 Sending build context to Docker daemon  1.658GB
12:31:42 Step 1/5 : ARG PARENT=asdf.dkr.ecr.us-west-2.amazonaws.com/base:latest
12:31:42 Step 2/5 : FROM ${PARENT}
12:31:42  ---> 95a664e8bec8

As you can see, tests_base:33053_89232 was built as 95a664e8bec8 and a new build with --build-arg PARENT=tests_base:33053_88719 used it as PARENT, but it still prints what's in the Dockerfile, not the overridden value, which is misleading.

Steps to reproduce the behavior

<!-- Describe the exact steps to reproduce. If possible, provide a minimum reproduction example; take into account that others do not have access to your private images, source code, and environment.

REMOVE SENSITIVE DATA BEFORE POSTING (replace those parts with "REDACTED") --> Define a Dockerfile with something like this:

ARG PARENT=asdf.dkr.ecr.us-west-2.amazonaws.com/base:latest
FROM ${PARENT}

and do a build with --build-arg PARENT=tests_base:33053_88719 option.

Output of docker version:

Client: Docker Engine - Community
 Version:           19.03.2
 API version:       1.40
 Go version:        go1.12.8
 Git commit:        6a30dfc
 Built:             Thu Aug 29 05:29:11 2019
 OS/Arch:           linux/amd64
 Experimental:      false

Server: Docker Engine - Community
 Engine:
  Version:          19.03.2
  API version:      1.40 (minimum version 1.12)
  Go version:       go1.12.8
  Git commit:       6a30dfc
  Built:            Thu Aug 29 05:27:45 2019
  OS/Arch:          linux/amd64
  Experimental:     false
 containerd:
  Version:          1.2.6
  GitCommit:        894b81a4b802e4eb2a91d1ce216b8817763c29fb
 runc:
  Version:          1.0.0-rc8
  GitCommit:        425e105d5a03fabd737a126ad93d62a9eeede87f
 docker-init:
  Version:          0.18.0
  GitCommit:        fec3683

Output of docker info:

Client:
 Debug Mode: false

Server:
 Containers: 95
  Running: 7
  Paused: 0
  Stopped: 88
 Images: 1007
 Server Version: 19.03.2
 Storage Driver: aufs
  Root Dir: /var/lib/docker/aufs
  Backing Filesystem: extfs
  Dirs: 1195
  Dirperm1 Supported: true
 Logging Driver: json-file
 Cgroup Driver: cgroupfs
 Plugins:
  Volume: local
  Network: bridge host ipvlan macvlan null overlay
  Log: awslogs fluentd gcplogs gelf journald json-file local logentries splunk syslog
 Swarm: inactive
 Runtimes: runc
 Default Runtime: runc
 Init Binary: docker-init
 containerd version: 894b81a4b802e4eb2a91d1ce216b8817763c29fb
 runc version: 425e105d5a03fabd737a126ad93d62a9eeede87f
 init version: fec3683
 Security Options:
  apparmor
  seccomp
   Profile: default
 Kernel Version: 4.15.0-66-generic
 Operating System: Ubuntu 18.04.3 LTS
 OSType: linux
 Architecture: x86_64
 CPUs: 16
 Total Memory: 61.47GiB
 Name: ip-10-150-14-172
 ID: ZJFE:DJF7:DUGP:WOGK:A66E:IVQS:X6HB:CKP4:SBRG:VROU:ZIBO:GWXF
 Docker Root Dir: /var/lib/docker
 Debug Mode: false
 Registry: https://index.docker.io/v1/
 Labels:
 Experimental: false
 Insecure Registries:
  127.0.0.0/8
 Live Restore Enabled: false

WARNING: No swap limit support
WARNING: the aufs storage-driver is deprecated, and will be removed in a future release.

Additional environment details (AWS, VirtualBox, physical, etc.) Running on AWS instances.

closed time in 16 days

bra-fsn

issue commentdocker/for-linux

Docker build doesn't print the overridden value with --build-arg

Try using the new docker build with buildkit enabled. The next generation docker build work is going to be powered by buildkit.

bra-fsn

comment created time in 16 days

delete branch andrewhsu/docker-ce

delete branch : 1903b2

delete time in 16 days

push eventdocker/docker-ce

Andrew Hsu

commit sha a9ad5f6959504343106fffa48798334acfaf5809

bump ver 19.03.5-beta2 Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

view details

Andrew Hsu

commit sha a8f2e052c39b0e4021119735f4d0a88b7bd3d77f

Merge pull request #635 from andrewhsu/1903b2 [19.03] bump ver 19.03.5-beta2

view details

push time in 16 days

PR merged docker/docker-ce

Reviewers
[19.03] bump ver 19.03.5-beta2

bump ver

+3 -1

1 comment

2 changed files

andrewhsu

pr closed time in 16 days

pull request commentdocker/docker-ce

[19.03] bump ver 19.03.5-beta2

Merging to get builds going.

andrewhsu

comment created time in 16 days

push eventandrewhsu/docker-ce

Sebastiaan van Stijn

commit sha 99e61e27b6ae2296df29106e80e24adbe58b1bde

Do not disable sig-proxy when using a TTY This partially reverts https://github.com/moby/moby/commit/e0b59ab52b87b8fc15dd5534c3231fdd74843f9f, and does not automatically disable proxying signals in TTY-mode Before this change: ------------------------------------ Start a container with a TTY in one shell: ``` docker run -it --init --name repro-28872 busybox sleep 30 ``` then, in another shell, kill the docker cli: ``` kill `pgrep -f repro-28872` ``` Notice that the CLI was killed, but the signal not forwarded to the container; the container continues running ``` docker container inspect --format '{{ .State.Status }}' repro-28872 running docker container rm -f repro-28872 ``` After this change: ------------------------------------ Start a container with a TTY in one shell: ``` docker run -it --init --name repro-28872 busybox sleep 30 ``` then, in another shell, kill the docker cli: ``` kill `pgrep -f repro-28872` ``` Verify that the signal was forwarded to the container, and the container exited ``` docker container inspect --format '{{ .State.Status }}' repro-28872 exited docker container rm -f repro-28872 ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit ee295049231c84e59d00b7cf31eaefb86d936aad) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 137b3cc89ec16730c3f9923ec158ce13a51f286f Component: cli

view details

Sebastiaan van Stijn

commit sha 1109168ceee6414ed0e8938acda5c9026c406a48

Add test for --sig-proxy with a TTY Add a test to verify that killing the docker CLI forwards the signal to the container. Test-case for moby/moby 28872 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 7cf1a8d4c96d198e208af2d75d14ab32b8c26dfe) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 79f5dbcd55a7aad3daabaa6f646509025aacf386 Component: cli

view details

Kir Kolyshkin

commit sha 30a660eac287a4f1d7ec3ab085ef4fad57d87a5e

TestSigProxyWithTTY: fix exec.CombinedOutput should not be used here because: - it redirects cmd Stdout and Stderr and we want it to be the tty - it calls cmd.Run which we already did While at it - use pty.Start() as it is cleaner - make sure we don't leave a zombie running, by calling Wait() in defer - use test.Name() for containerName Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit bc4ed69a23e1840b0ebae2b28531dd323cdba28f) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 149f69ca0604a8cdfbdef7e2f323d5c7dd208880 Component: cli

view details

Tonis Tiigi

commit sha 44c64cdeb6e1fb0ca9383fae7afa8dca5d2d9b2b

vendor: update buildkit to ff93519ee Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Upstream-commit: 25162d4a4ee031d409c3bb6d8a26ba81c45eb3a0 Component: engine

view details

Andrew Hsu

commit sha 0dabf1e8964c741b6b110b42b2c0d349454fb886

Merge pull request #2177 from thaJeztah/19.03_backport_fix_sig_proxy [19.03 backport] Do not disable sig-proxy when using a TTY Upstream-commit: 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9 Component: cli

view details

GordonTheTurtle

commit sha 345e14b7af76ddba903b171a9c7dc3ac4fbd2266

Merge component 'cli' from git@github.com:docker/cli 19.03

view details

Andrew Hsu

commit sha 04f81cc905f4ad53dc7f8c64f81d3e23b3185a85

Merge pull request #420 from tonistiigi/1903-buildkit-update [19.03] vendor: update buildkit to ff93519ee Upstream-commit: 5d5083a57a1c071a935bc6a1be6b1b1cc5cf1ede Component: engine

view details

GordonTheTurtle

commit sha c7fe6bb395172bf47236864c4fe3e4769bc5c306

Merge component 'engine' from git@github.com:docker/engine 19.03

view details

Andrew Hsu

commit sha a9ad5f6959504343106fffa48798334acfaf5809

bump ver 19.03.5-beta2 Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

view details

push time in 16 days

PR closed docker/docker-ce

Corrected mistake for the word in Readme.md

It appears that the singular demonstrative This is modifying the plural noun. Consider using a plural demonstrative or a singular noun instead.

Please do not send pull requests to this docker/docker-ce repository.

We do, however, take contributions gladly.

See https://github.com/docker/docker-ce/blob/master/CONTRIBUTING.md

Thanks!

+1 -1

4 comments

1 changed file

anandbhagwat

pr closed time in 16 days

pull request commentdocker/docker-ce

Corrected mistake for the word in Readme.md

The word hosts is used as a verb, not a noun, in the sentence.

anandbhagwat

comment created time in 16 days

PR closed docker/docker-ce

give more time to delete and ask user once dco/no

deleting the old config files from docker.io (18.09.7-0ubuntu1~18.04.4) with aptitude nukes all the docker files from an existing and running docker-ce installation

Thanks!

+2 -2

2 comments

1 changed file

sjo00

pr closed time in 16 days

pull request commentdocker/docker-ce

give more time to delete and ask user once

This docker/docker-ce repo is a composite of upstream repos. The upstream repo for this PR's patch is https://github.com/moby/moby. Open your PR there if you still want to propose this change.

sjo00

comment created time in 16 days

PR opened docker/docker-ce

Reviewers
[19.03] bump ver 19.03.5-beta2

bump ver

+3 -1

0 comment

2 changed files

pr created time in 16 days

create barnchandrewhsu/docker-ce

branch : 1903b2

created branch time in 16 days

push eventdocker/engine

Tonis Tiigi

commit sha 25162d4a4ee031d409c3bb6d8a26ba81c45eb3a0

vendor: update buildkit to ff93519ee Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

view details

Andrew Hsu

commit sha 5d5083a57a1c071a935bc6a1be6b1b1cc5cf1ede

Merge pull request #420 from tonistiigi/1903-buildkit-update [19.03] vendor: update buildkit to ff93519ee

view details

push time in 16 days

PR merged docker/engine

[19.03] vendor: update buildkit to ff93519ee impact/changelog

https://github.com/moby/buildkit/pull/1243

Signed-off-by: Tonis Tiigi tonistiigi@gmail.com

changelog line:

- Fix builder-next: permission errors on using build secrets or ssh forwarding with userns-remap.
- Fix builder-next: copying a symlink inside an already copied directory.
+10 -24

0 comment

4 changed files

tonistiigi

pr closed time in 16 days

push eventdocker/cli

Sebastiaan van Stijn

commit sha 137b3cc89ec16730c3f9923ec158ce13a51f286f

Do not disable sig-proxy when using a TTY This partially reverts https://github.com/moby/moby/commit/e0b59ab52b87b8fc15dd5534c3231fdd74843f9f, and does not automatically disable proxying signals in TTY-mode Before this change: ------------------------------------ Start a container with a TTY in one shell: ``` docker run -it --init --name repro-28872 busybox sleep 30 ``` then, in another shell, kill the docker cli: ``` kill `pgrep -f repro-28872` ``` Notice that the CLI was killed, but the signal not forwarded to the container; the container continues running ``` docker container inspect --format '{{ .State.Status }}' repro-28872 running docker container rm -f repro-28872 ``` After this change: ------------------------------------ Start a container with a TTY in one shell: ``` docker run -it --init --name repro-28872 busybox sleep 30 ``` then, in another shell, kill the docker cli: ``` kill `pgrep -f repro-28872` ``` Verify that the signal was forwarded to the container, and the container exited ``` docker container inspect --format '{{ .State.Status }}' repro-28872 exited docker container rm -f repro-28872 ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit ee295049231c84e59d00b7cf31eaefb86d936aad) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Sebastiaan van Stijn

commit sha 79f5dbcd55a7aad3daabaa6f646509025aacf386

Add test for --sig-proxy with a TTY Add a test to verify that killing the docker CLI forwards the signal to the container. Test-case for moby/moby 28872 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 7cf1a8d4c96d198e208af2d75d14ab32b8c26dfe) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Kir Kolyshkin

commit sha 149f69ca0604a8cdfbdef7e2f323d5c7dd208880

TestSigProxyWithTTY: fix exec.CombinedOutput should not be used here because: - it redirects cmd Stdout and Stderr and we want it to be the tty - it calls cmd.Run which we already did While at it - use pty.Start() as it is cleaner - make sure we don't leave a zombie running, by calling Wait() in defer - use test.Name() for containerName Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit bc4ed69a23e1840b0ebae2b28531dd323cdba28f) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Andrew Hsu

commit sha 99c5edceb48d64c1aa5d09b8c9c499d431d98bb9

Merge pull request #2177 from thaJeztah/19.03_backport_fix_sig_proxy [19.03 backport] Do not disable sig-proxy when using a TTY

view details

push time in 16 days

PR merged docker/cli

[19.03 backport] Do not disable sig-proxy when using a TTY impact/changelog status/2-code-review

backport of:

  • https://github.com/docker/cli/pull/1841 Do not disable sig-proxy when using a TTY
  • https://github.com/docker/cli/pull/2016 TestSigProxyWithTTY: fix

This partially reverts https://github.com/moby/moby/commit/e0b59ab52b87b8fc15dd5534c3231fdd74843f9f (https://github.com/moby/moby/pull/2426), and does not automatically disable proxying signals in TTY-mode

fixes https://github.com/moby/moby/issues/28872 (docker client doesn't pass signals when a terminal is attached) fixes https://github.com/moby/moby/issues/3793 docker client not passing signals to dockerd

relates to:

  • https://github.com/moby/moby/issues/9098 Kill docker exec command will not terminate the spawned process
    • This patch does not fix the docker exec case; it looks like there's no API to kill an exec'd process, so there's no signal-proxy for this yet

Before this change:

Start a container with a TTY in one shell:

docker run -it --init --name repro-28872 busybox sleep 30

then, in another shell, kill the docker cli:

kill `pgrep -f repro-28872`

Notice that the CLI was killed, but the signal not forwarded to the container; the container continues running

docker container inspect --format '{{ .State.Status }}' repro-28872
running

docker container rm -f repro-28872

After this change:

Start a container with a TTY in one shell:

docker run -it --init --name repro-28872 busybox sleep 30

then, in another shell, kill the docker cli:

kill `pgrep -f repro-28872`

Verify that the signal was forwarded to the container, and the container exited

docker container inspect --format '{{ .State.Status }}' repro-28872
exited

docker container rm -f repro-28872

- Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: -->

- Fix docker client doesn't pass signals when a terminal is attached

- A picture of a cute animal (not mandatory but encouraged)

+844 -5

0 comment

31 changed files

thaJeztah

pr closed time in 16 days

pull request commentmoby/moby

Run buildkit integration tests

@SamWhited i added b43076e to always generate a bundle tgz for the buildkit step. see https://github.com/moby/moby/pull/40023/commits/b43076e6977cf64dc7465c4ca55325cb2e282870#diff-58231b16fdee45a03a4ee3cf94a9f2c3R113 for how it collects files to put into the tgz.

tiborvass

comment created time in 17 days

push eventtiborvass/docker

Andrew Hsu

commit sha b43076e6977cf64dc7465c4ca55325cb2e282870

Jenkinsfile: always create bundles tgz for buildkit step Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

view details

push time in 17 days

issue openeddocker/docker.github.io

clarify docker-ee s390x linux packages only for 17.06

Docker EE install instructions mention installing docker-ee on s390x (aka z systems). It should clarify that it is only applicable for 17.06, e.g. https://github.com/docker/docker.github.io/blob/master/install/linux/docker-ee/rhel.md

Since according to the compatibility matrix, docker-ee only had supported packages on s390x architecture for the 17.06 version: https://success.docker.com/article/compatibility-matrix

created time in 17 days

push eventdocker/engine

Andrew Hsu

commit sha 031ef2dc8e0510280c9e55d07b8287e0a73c7fcc

Windows: disable flaky test TestStartReturnCorrectExitCode Signed-off-by: Andrew Hsu <andrewhsu@docker.com> (cherry picked from commit 1be272ef76ec7f37d680525e725c1a17a85a32cf) Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

view details

Andrew Hsu

commit sha 35913e58c2089c2d19eb02b611fc289d1c56f113

Merge pull request #419 from andrewhsu/xit [19.03] Windows: disable flaky test TestStartReturnCorrectExitCode

view details

push time in 20 days

delete branch andrewhsu/moby

delete branch : xit

delete time in 20 days

PR merged docker/engine

Reviewers
[19.03] Windows: disable flaky test TestStartReturnCorrectExitCode

The 19.03 branch has failures on the tests run after PR merges:

--- FAIL: TestDockerSuite/TestStartReturnCorrectExitCode (9.39s)
    docker_cli_start_test.go:198: assertion failed: 125 (exitCode int) != 12 (int): out: time="2019-10-30T18:28:20Z" level=error msg="error waiting for container: EOF" 

This PR is a clean backport of PR https://github.com/moby/moby/pull/40117

+15 -0

0 comment

1 changed file

andrewhsu

pr closed time in 20 days

issue commentmoby/moby

Copying non-root owned files between stages fails when running with userns remapping

I just reproduced the original issue with docker-ce 19.03.4 using the legacy builder, but stuff works with docker-ce 19.03.4 enabled with buildkit builds.

bash$ DOCKER_BUILDKIT=1 docker build --progress=plain --no-cache -t asdf .
#2 [internal] load build definition from Dockerfile
#2 transferring dockerfile: 150B done
#2 DONE 0.0s

#1 [internal] load .dockerignore
#1 transferring context: 2B done
#1 DONE 0.0s

#3 [internal] load metadata for docker.io/library/busybox:latest
#3 DONE 0.3s

#4 [foo 1/2] FROM docker.io/library/busybox@sha256:1303dbf110c57f3edf68d9f5...
#4 CACHED

#5 [foo 2/2] RUN touch x && chown 1:1 x
#5 DONE 0.6s

#6 [stage-1 2/3] COPY --from=foo x /
#6 DONE 0.1s

#7 [stage-1 3/3] RUN cat /etc/passwd && ls -al /
#7 0.509 root:x:0:0:root:/root:/bin/sh
#7 0.509 daemon:x:1:1:daemon:/usr/sbin:/bin/false
#7 0.509 bin:x:2:2:bin:/bin:/bin/false
#7 0.509 sys:x:3:3:sys:/dev:/bin/false
#7 0.509 sync:x:4:100:sync:/bin:/bin/sync
#7 0.509 mail:x:8:8:mail:/var/spool/mail:/bin/false
#7 0.509 www-data:x:33:33:www-data:/var/www:/bin/false
#7 0.509 operator:x:37:37:Operator:/var:/bin/false
#7 0.509 nobody:x:65534:65534:nobody:/home:/bin/false
#7 0.510 total 44
#7 0.510 drwxr-xr-x    1 root     root          4096 Oct 31 23:02 .
#7 0.510 drwxr-xr-x    1 root     root          4096 Oct 31 23:02 ..
#7 0.510 drwxr-xr-x    2 root     root         12288 Oct 28 18:40 bin
#7 0.510 drwxr-xr-x    5 root     root           340 Oct 31 23:02 dev
#7 0.510 drwxr-xr-x    1 root     root          4096 Oct 31 23:02 etc
#7 0.510 drwxr-xr-x    2 nobody   nogroup       4096 Oct 28 18:40 home
#7 0.510 dr-xr-xr-x  138 nobody   nogroup          0 Oct 31 23:02 proc
#7 0.510 drwx------    2 root     root          4096 Oct 28 18:40 root
#7 0.510 dr-xr-xr-x   13 nobody   nogroup          0 Oct 31 23:02 sys
#7 0.510 drwxrwxrwt    2 root     root          4096 Oct 28 18:40 tmp
#7 0.510 drwxr-xr-x    3 root     root          4096 Oct 28 18:40 usr
#7 0.510 drwxr-xr-x    4 root     root          4096 Oct 28 18:40 var
#7 0.510 -rw-r--r--    1 daemon   daemon           0 Oct 31 23:02 x
#7 DONE 0.6s

#8 exporting to image
#8 exporting layers
#8 exporting layers 0.1s done
#8 writing image sha256:c2d55532c926d9d6e7cc15086d8d3ca7567bcc2a5821d73ae2bef5985ca06d9e done
#8 naming to docker.io/library/asdf done
#8 DONE 0.1s
bash$ docker info | grep userns
WARNING: No swap limit support
  userns

Perhaps this issue should be renamed to emphasize it is only an issue with legacy builder.

michael42

comment created time in 21 days

pull request commentmoby/moby

Fix COPY --from with userns and non zero uid/gid files

I'm able to reproduce the error with docker-ce 19.03.4 legacy builder, but the issue that this PR is trying to fix does not exist with docker-ce 19.03.4 enabled with buildkit builds. I'd recommend using docker build with buildkit builds to work around this issue since that is what the docker engine is migrating towards as the default in the future.

This PR should be closed.

segevfiner

comment created time in 21 days

pull request commentmoby/moby

Fix COPY --from with userns and non zero uid/gid files

I'll have a go at reproducing the original issue this PR is trying to fix. Not sure if it is still a thing that needs to be fixed after #38599 has been merged.

segevfiner

comment created time in 21 days

pull request commentmoby/moby

[builder-next] fix squashing base image layer

Looks like this PR needs more work to be taken out of draft mode. @Blyschak you still working on this or should it be closed?

Blyschak

comment created time in 21 days

issue openedmoby/moby

jenkins nodes for user namespace PR checks

tracking issue

created time in 21 days

pull request commentmoby/moby

Fix AppArmor profile docker-default /proc/sys rule

A lot has changed in the master branch to the PR checks. If this could get a rebase, would then re-run with relevant tests (even though this PR doesn't have a specific test for this change) would be good to get official green before review. cc @justincormack

philsphicas

comment created time in 21 days

pull request commentmoby/moby

archive: refactor race fixing logic to prevent potential deadlock

@tiborvass when you get a chance, rebase this to get the latest tests run on this change

tiborvass

comment created time in 21 days

pull request commentmoby/moby

Make binary output targets use own build cmd

I think @tonistiigi is interested in this one

cpuguy83

comment created time in 21 days

pull request commentmoby/moby

awslogs & archive: prevent 2 goroutine leaks in test functions

Only failure is on cleanup:

...
00:59:51.554  DONE 273 tests, 6 skipped in 2589.479s
00:59:51.554  ---> Making bundle: .integration-daemon-stop (in bundles/test-integration)
00:59:51.554  ++++ cat bundles/test-integration/TestDockerDaemonSuite/TestFailedPluginRemove/d4edc54f8e62d/docker.pid
00:59:51.554  +++ kill 5469
00:59:51.554  /go/src/github.com/docker/docker/hack/make/.integration-daemon-stop: line 10: wait: pid 5469 is not a child of this shell
00:59:51.554  warning: PID 5469 from bundles/test-integration/TestDockerDaemonSuite/TestFailedPluginRemove/d4edc54f8e62d/docker.pid had a nonzero exit code
00:59:51.554  ++++ cat bundles/test-integration/docker.pid
00:59:51.554  +++ kill 7289

Similar failure in older PR: https://github.com/moby/moby/pull/39271#issuecomment-511586087

But all tests are green.

lzhfromustc

comment created time in 21 days

pull request commentmoby/moby

Windows: Build and use gotestsum for running all tests

Talked with vikram about this PR today. Looks like the junit report of failures is enough to make sure the github status of the PR checks is red even though the unix return code of that step is 0. This seems acceptable to get this PR in but needs work later to get the unix return code of the step to accurately reflect test failures.

thaJeztah

comment created time in 21 days

PR opened docker/engine

Reviewers
[19.03] Windows: disable flaky test TestStartReturnCorrectExitCode

The 19.03 branch has failures on the tests run after PR merges:

--- FAIL: TestDockerSuite/TestStartReturnCorrectExitCode (9.39s)
    docker_cli_start_test.go:198: assertion failed: 125 (exitCode int) != 12 (int): out: time="2019-10-30T18:28:20Z" level=error msg="error waiting for container: EOF" 

This PR is a clean backport of PR https://github.com/moby/moby/pull/40117

+15 -0

0 comment

1 changed file

pr created time in 21 days

create barnchandrewhsu/moby

branch : xit

created branch time in 21 days

pull request commentmoby/moby

Windows: Build and use gotestsum for running all tests

Workaround for now: #40155

thaJeztah

comment created time in 22 days

pull request commentmoby/moby

Windows: Build and use gotestsum for running all tests

Looks like the failures listed in the junit report are also seen in other PRs to moby: https://github.com/moby/moby/pull/40154#issuecomment-548000180

  • TestDebugInfo
  • TestInfoInsecureRegistries
  • TestInfoRegistryMirrors
thaJeztah

comment created time in 22 days

pull request commentmoby/moby

Windows: Build and use gotestsum for running all tests

I'm starting to see the junit reports of the test results in jenkins UI now, which is a great step: https://ci.docker.com/public/blue/organizations/jenkins/moby/detail/PR-39998/38/tests

thaJeztah

comment created time in 22 days

push eventdocker/engine

Kir Kolyshkin

commit sha 92a8618ddc48e0c6fe464035d618d0996a1ff266

Bump golang 1.12.12 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

view details

Andrew Hsu

commit sha ddb60aa6d1ba1d9bfbb655fa1f3c3359f82979aa

Merge pull request #418 from kolyshkin/19.03-go1.12.12 [19.03] Bump golang 1.12.12

view details

push time in 22 days

PR merged docker/engine

[19.03] Bump golang 1.12.12
+4 -4

0 comment

4 changed files

kolyshkin

pr closed time in 22 days

push eventdocker/docker-ce

Andrew Hsu

commit sha 4dfdc66276f21c4c4fcfc85fdf652d191b75ca35

bump ver 19.03.5-beta1 Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

view details

Andrew Hsu

commit sha 4fe4dc73f679cf8ec6ed4ca50c84270406c298d0

Merge pull request #634 from andrewhsu/1903b1 [19.03] bump ver 19.03.5-beta1

view details

push time in 22 days

PR merged docker/docker-ce

Reviewers
[19.03] bump ver 19.03.5-beta1

bump ver and update changelog from what was merged: https://github.com/docker/engine/pulls?utf8=%E2%9C%93&q=is%3Aclosed+milestone%3A19.03.5+label%3Aimpact%2Fchangelog

+13 -1

1 comment

2 changed files

andrewhsu

pr closed time in 22 days

pull request commentdocker/docker-ce

[19.03] bump ver 19.03.5-beta1

merging to get the build going

andrewhsu

comment created time in 22 days

push eventandrewhsu/docker-ce

Tim Sampson

commit sha c4b8f0fdce0d883c10ba0fbd8ab0a87c17c0b281

add rudimentary fish completions for docker network Signed-off-by: Tim Sampson <tim@sampson.fi> (cherry picked from commit 2f7b364cb397526812f13c0d6c107919e9516ca3) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 6c66c799c7fe1c7f58d022a6e343aea54c504df6 Component: cli

view details

Morten Hekkvang

commit sha 83a3adfba289906bcad01a689ba284fd76aa058c

Make service completion faster Signed-off-by: Morten Hekkvang <morten.hekkvang@sbab.se> (cherry picked from commit f55c5b6566e52d3ead55bc0d96528bc2a39daeea) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 667bd9a1b8fd9bb2066fbb575e6359d15892707e Component: cli

view details

Morten Hekkvang

commit sha a669026198bf22ecf34b1ba4ee9964a1d48619d9

Fix substitution of comma to space character, suggested by @albers Signed-off-by: Morten Hekkvang <morten.hekkvang@sbab.se> (cherry picked from commit b85e1e2efefcc06c8de426d003fa2936f2286bb4) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: c70ce79adc2e13e48d45c58301a371623d4aaf12 Component: cli

view details

Morten Hekkvang

commit sha 431ea11fc3013ff4fc802f55e2f71edcf759bff2

Move filtering to __docker_complete_services, as suggested by @albers Signed-off-by: Morten Hekkvang <morten.hekkvang@sbab.se> (cherry picked from commit 6ebcc211a7a955b93297db1f0ad96237c14691ae) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 9447d7431b8354083e25dc5768bcba23c5256bd8 Component: cli

view details

Morten Hekkvang

commit sha e3ed8c3900f85cac87f2c06a315dbb9d2631a07b

Fix erroneous space indentation of shell script Signed-off-by: Morten Hekkvang <morten.hekkvang@sbab.se> (cherry picked from commit fc19fb6d95da6a4496ffd170412918da3529eb99) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 69f0132397ba95e3a00d3b66cea905302b6a6c9b Component: cli

view details

Trapier Marshall

commit sha eeaca109e75d92303a3185fc152d747b32a13c8f

Add bash completion for `builder build` Signed-off-by: Trapier Marshall <trapier.marshall@docker.com> (cherry picked from commit 86ae871e0a229d08e7d9746a35fa71f5305dd7d7) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 2fe281d17066fe5b1af336cfc3fa21844dab62c9 Component: cli

view details

Harald Albers

commit sha bc78bc021cf5568f2b1e9368c5216165621beead

Add bash completion for `builder build` options Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit cd9b39fc524c3b5f63b99b6795216d2180b0bfba) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 57332bcea37ebd00954ad0c3d3574abea9cd3529 Component: cli

view details

Forest Johnson

commit sha b75545f98d36efc0b33b6282a9a3dcb9d4c95a55

Explain -s flag on docker ps https://github.com/docker/docker.github.io/issues/1520#issuecomment-467971886 Signed-off-by: Forest Johnson <fjohnson@peoplenetonline.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit f7ab2987c39162cd47c2f1738d1590e7226b5537) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: c4e5fd7e53a5a3dc89734c391099aed8b8a0b795 Component: cli

view details

Daniel Cassidy

commit sha 848e74335ba81878ffa5236b302be12d9b758e56

builder.md: Correct copy/paste error Signed-off-by: Daniel Cassidy <mail@danielcassidy.me.uk> (cherry picked from commit e9ada56a888a042476f370d2de45b0633f7f85f6) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 66f8d279c1dc7f0c18b05c6dc8b39a79b5c18fdf Component: cli

view details

Odin Ugedal

commit sha e286381ed288abbf51ec8d1c8f344b9d6de763f8

Fix phrasing when referring to the freezer cgroup Signed-off-by: Odin Ugedal <odin@ugedal.com> (cherry picked from commit a0dd6e025d6d18527931a24b9e7d71132c47e601) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: a90e5598a4acb89e45730c418520dba5eee6e58c Component: cli

view details

Daniel Artine

commit sha dfd6965e6fa466ff0dd82ed599137905cad32817

Updating deprecated command example in search.md --stars example is deprecated. Changing to --filter=stars=5 Signed-off-by: danielartine <daniel.artine@ufrj.br> (cherry picked from commit bba0a4d5ac225a28eb0bd1b14a086f7197e8d762) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: df5c7130df9b81548ff5c27528c11e4696550cca Component: cli

view details

Adrian Plata

commit sha 1b850e1fb234342179ae5e1585aa16137b35392d

Minor formatting changes and a typo fix. Signed-off-by: Adrian Plata <adrian.plata@docker.com> (cherry picked from commit ba7ec36de2c5c83d689f5d2e1f3e0d209606d8c3) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: aa45ea366c18ae1265c5e3910d7f7b22b9e4c0dd Component: cli

view details

Brandon Mitchell

commit sha 3467817e1c4f5ab345fcb3ae0e25bbb2cdaff484

Adjusting glossary reference and clarrifying the start of a Dockerfile Signed-off-by: Brandon Mitchell <git@bmitch.net> (cherry picked from commit 937ce69b4251d355db64eb88715ced76ed04b157) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: c050ae7fb168a9dd5cb8a65a72cc7d2ec7993cda Component: cli

view details

Daniel Helfand

commit sha d10e0ad1826742c4dd4cc83f184222e88eeeb520

update Jenkins Build Status urls for README Signed-off-by: danielhelfand <helfand.4@gmail.com> (cherry picked from commit 46f3f9ac047bc5d4fe22183275b4e25d91870608) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 9597e681cb1273616b2657662227df57b469c711 Component: cli

view details

Andrew Hsu

commit sha 584423dc0fd347c0b1f128501d62531829976dd9

Merge pull request #2176 from thaJeztah/19.03_backport_completion [19.03 backport] completion script updates and fixes Upstream-commit: 5cef8fc8e5067f88e2563446506ca0cf794dab0a Component: cli

view details

Andrew Hsu

commit sha 76c903b14a882462edd93ccea8e39f2d85c67f67

Merge pull request #2178 from thaJeztah/19.03_backport_docs_updates [19.03 backport] docs updates Upstream-commit: ad6c6670340a726e3f3fd280b17266ba1145aa3b Component: cli

view details

GordonTheTurtle

commit sha e39e995156d68e6fddd9d4caa46d30bdf1ce075f

Merge component 'cli' from git@github.com:docker/cli 19.03

view details

Andrew Hsu

commit sha 4dfdc66276f21c4c4fcfc85fdf652d191b75ca35

bump ver 19.03.5-beta1 Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

view details

push time in 22 days

push eventdocker/cli

Forest Johnson

commit sha c4e5fd7e53a5a3dc89734c391099aed8b8a0b795

Explain -s flag on docker ps https://github.com/docker/docker.github.io/issues/1520#issuecomment-467971886 Signed-off-by: Forest Johnson <fjohnson@peoplenetonline.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit f7ab2987c39162cd47c2f1738d1590e7226b5537) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Daniel Cassidy

commit sha 66f8d279c1dc7f0c18b05c6dc8b39a79b5c18fdf

builder.md: Correct copy/paste error Signed-off-by: Daniel Cassidy <mail@danielcassidy.me.uk> (cherry picked from commit e9ada56a888a042476f370d2de45b0633f7f85f6) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Odin Ugedal

commit sha a90e5598a4acb89e45730c418520dba5eee6e58c

Fix phrasing when referring to the freezer cgroup Signed-off-by: Odin Ugedal <odin@ugedal.com> (cherry picked from commit a0dd6e025d6d18527931a24b9e7d71132c47e601) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Daniel Artine

commit sha df5c7130df9b81548ff5c27528c11e4696550cca

Updating deprecated command example in search.md --stars example is deprecated. Changing to --filter=stars=5 Signed-off-by: danielartine <daniel.artine@ufrj.br> (cherry picked from commit bba0a4d5ac225a28eb0bd1b14a086f7197e8d762) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Adrian Plata

commit sha aa45ea366c18ae1265c5e3910d7f7b22b9e4c0dd

Minor formatting changes and a typo fix. Signed-off-by: Adrian Plata <adrian.plata@docker.com> (cherry picked from commit ba7ec36de2c5c83d689f5d2e1f3e0d209606d8c3) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Brandon Mitchell

commit sha c050ae7fb168a9dd5cb8a65a72cc7d2ec7993cda

Adjusting glossary reference and clarrifying the start of a Dockerfile Signed-off-by: Brandon Mitchell <git@bmitch.net> (cherry picked from commit 937ce69b4251d355db64eb88715ced76ed04b157) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Daniel Helfand

commit sha 9597e681cb1273616b2657662227df57b469c711

update Jenkins Build Status urls for README Signed-off-by: danielhelfand <helfand.4@gmail.com> (cherry picked from commit 46f3f9ac047bc5d4fe22183275b4e25d91870608) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Andrew Hsu

commit sha ad6c6670340a726e3f3fd280b17266ba1145aa3b

Merge pull request #2178 from thaJeztah/19.03_backport_docs_updates [19.03 backport] docs updates

view details

push time in 23 days

PR merged docker/cli

[19.03 backport] docs updates impact/documentation kind/docs status/3-docs-review

backports of:

  • https://github.com/docker/cli/pull/1697 Explain -s flag on docker ps
    • relates to https://github.com/docker/docker.github.io/issues/1520 https://github.com/docker/docker.github.io/issues/1520#issuecomment-467971886 Explain the SIZE column in "docker ps -s" and what "virtual" keyword means
    • relates to https://github.com/docker/docker.github.io/pull/8371 Explain -s flag on docker ps
  • https://github.com/docker/cli/pull/2014 builder.md: Correct copy/paste error
  • https://github.com/docker/cli/pull/2053 Fix phrasing when referring to the freezer cgroup
    • relates to https://github.com/moby/moby/pull/39759 Fix phrasing when referring to the freezer cgroup
  • https://github.com/docker/cli/pull/2072 Updating deprecated command example in search.md
  • https://github.com/docker/cli/pull/2128 Minor formatting changes and a typo fix
  • https://github.com/docker/cli/pull/2133 Adjusting glossary reference and clarrifying the start of a Dockerfile
  • https://github.com/docker/cli/pull/2156 Correct Jenkins Build Status URLs for README
    • closes https://github.com/docker/cli/issues/2155 Jenkins Build Status in README
+43 -24

2 comments

9 changed files

thaJeztah

pr closed time in 23 days

push eventdocker/cli

Tim Sampson

commit sha 6c66c799c7fe1c7f58d022a6e343aea54c504df6

add rudimentary fish completions for docker network Signed-off-by: Tim Sampson <tim@sampson.fi> (cherry picked from commit 2f7b364cb397526812f13c0d6c107919e9516ca3) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Morten Hekkvang

commit sha 667bd9a1b8fd9bb2066fbb575e6359d15892707e

Make service completion faster Signed-off-by: Morten Hekkvang <morten.hekkvang@sbab.se> (cherry picked from commit f55c5b6566e52d3ead55bc0d96528bc2a39daeea) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Morten Hekkvang

commit sha c70ce79adc2e13e48d45c58301a371623d4aaf12

Fix substitution of comma to space character, suggested by @albers Signed-off-by: Morten Hekkvang <morten.hekkvang@sbab.se> (cherry picked from commit b85e1e2efefcc06c8de426d003fa2936f2286bb4) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Morten Hekkvang

commit sha 9447d7431b8354083e25dc5768bcba23c5256bd8

Move filtering to __docker_complete_services, as suggested by @albers Signed-off-by: Morten Hekkvang <morten.hekkvang@sbab.se> (cherry picked from commit 6ebcc211a7a955b93297db1f0ad96237c14691ae) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Morten Hekkvang

commit sha 69f0132397ba95e3a00d3b66cea905302b6a6c9b

Fix erroneous space indentation of shell script Signed-off-by: Morten Hekkvang <morten.hekkvang@sbab.se> (cherry picked from commit fc19fb6d95da6a4496ffd170412918da3529eb99) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Trapier Marshall

commit sha 2fe281d17066fe5b1af336cfc3fa21844dab62c9

Add bash completion for `builder build` Signed-off-by: Trapier Marshall <trapier.marshall@docker.com> (cherry picked from commit 86ae871e0a229d08e7d9746a35fa71f5305dd7d7) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Harald Albers

commit sha 57332bcea37ebd00954ad0c3d3574abea9cd3529

Add bash completion for `builder build` options Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit cd9b39fc524c3b5f63b99b6795216d2180b0bfba) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Andrew Hsu

commit sha 5cef8fc8e5067f88e2563446506ca0cf794dab0a

Merge pull request #2176 from thaJeztah/19.03_backport_completion [19.03 backport] completion script updates and fixes

view details

push time in 23 days

PR merged docker/cli

Reviewers
[19.03 backport] completion script updates and fixes area/completion status/2-code-review

backports of:

  • https://github.com/docker/cli/pull/2066 add rudimentary fish completions for docker network
  • https://github.com/docker/cli/pull/2078 Contrib: Make bash completion faster for services
  • https://github.com/docker/cli/pull/2116 Add bash completion for builder build
  • https://github.com/docker/cli/pull/2125 Add bash completion for builder build options
+33 -7

1 comment

2 changed files

thaJeztah

pr closed time in 23 days

PR opened docker/docker-ce

Reviewers
[19.03] bump ver 19.03.5-beta1

bump ver and update changelog from what was merged: https://github.com/docker/engine/pulls?utf8=%E2%9C%93&q=is%3Aclosed+milestone%3A19.03.5+label%3Aimpact%2Fchangelog

+13 -1

0 comment

2 changed files

pr created time in 23 days

create barnchandrewhsu/docker-ce

branch : 1903b1

created branch time in 23 days

issue commentdocker/for-linux

/proc/sys/net/ipv4/ip_forward set to 1 when install and start docker

Docker needs to setup ip forwarding to function when doing networking. Docs for some more info.

willzhang

comment created time in 23 days

issue closeddocker/for-linux

/proc/sys/net/ipv4/ip_forward set to 1 when install and start docker

why /proc/sys/net/ipv4/ip_forward set to 1 when install and start docker,any dos for this ?what it mean?

[root@iZj6cetbb1qeqfstcehc34Z ~]# cat /proc/sys/net/ipv4/ip_forward                                                            
0
[root@iZj6cetbb1qeqfstcehc34Z ~]# 
[root@iZj6cetbb1qeqfstcehc34Z ~]# systemctl start docker
[root@iZj6cetbb1qeqfstcehc34Z ~]# cat /proc/sys/net/ipv4/ip_forward
1

closed time in 23 days

willzhang

issue closeddocker/for-linux

How to rm docker successfully, Error response from daemon: container "driver "overlay" failed to remove root filesystem"

<!-- This issue tracker is for bug reports and feature requests. For questions, and getting help on using docker:

  • Docker documentation - https://docs.docker.com
  • Docker Forums - https://forums.docker.com
  • Docker community Slack - https://dockercommunity.slack.com/ (register here: http://dockr.ly/community)
  • Post a question on StackOverflow, using the Docker tag --> Could someone help how to delete the docker container, thanks!
  • [x] This is a bug report
  • [ ] This is a feature request
  • [ ] I searched existing issues before opening this one

<!-- DO NOT report security issues publicly! If you suspect you discovered a security issue, send your report privately to security@docker.com. -->

Expected behavior

  1. stop and rm container successfully

Actual behavior

  1. Error response from daemon: container a0b16a2972e475d851c09e9d4ff39dcab170039bedc3b0cb1d2de81005cdf4d5: driver "overlay" failed to remove root filesystem: remove /var/lib/docker/overlay/d4690a38a8a3087d8a050cba521a8fbdd55da0841cfbfb442cd1938846d8f689/upper/var/log/tsar.data: operation not permitted

  2. Docker status in ‘Removal In Progress'

Steps to reproduce the behavior

  1. stop container and the container in Exit status
  2. rm container and return error
  3. reboot and then rm can't solve the problem <!-- Describe the exact steps to reproduce. If possible, provide a minimum reproduction example; take into account that others do not have access to your private images, source code, and environment.

REMOVE SENSITIVE DATA BEFORE POSTING (replace those parts with "REDACTED") -->

Output of docker version:

(paste your output here)

Output of docker info: ontainers: 2 Running: 1 Paused: 0 Stopped: 1 Images: 1 Server Version: 18.06.1-ce Storage Driver: overlay Backing Filesystem: extfs Supports d_type: true Logging Driver: json-file Cgroup Driver: cgroupfs Plugins: Volume: local Network: bridge host macvlan null overlay Log: awslogs fluentd gcplogs gelf journald json-file logentries splunk syslog Swarm: inactive Runtimes: runc Default Runtime: runc Init Binary: docker-init containerd version: 468a545b9edcd5932818eb9de8e72413e616e86e runc version: 69663f0bd4b60df09991c08812a60108003fa340 init version: fec3683 Kernel Version: 3.16.56-OpenNetworkLinux Operating System: Debian GNU/Linux 8 (jessie) OSType: linux Architecture: x86_64 CPUs: 2 Total Memory: 15.49GiB Name: xxxx ID: 3GEI:OISF:CSAX:5UQS:GAHU:LULV:V4CW:NY36:RNAW:I6OV:GU4J:BV3F Docker Root Dir: /var/lib/docker Debug Mode (client): false Debug Mode (server): false Registry: https://index.docker.io/v1/ Labels: Experimental: false Insecure Registries: 127.0.0.0/8 Live Restore Enabled: false

WARNING: No cpu cfs quota support WARNING: No cpu cfs period support WARNING: bridge-nf-call-iptables is disabled WARNING: bridge-nf-call-ip6tables is disabled

(paste your output here)

Additional environment details (AWS, VirtualBox, physical, etc.)

closed time in 23 days

TidyHuang

issue commentdocker/for-linux

How to rm docker successfully, Error response from daemon: container "driver "overlay" failed to remove root filesystem"

We no longer support debian jessie operating system (looks like yours is a derivative of that because of the old kernel version).

Also, the docker-ce 18.06.x version is no longer supported.

If possible, please have a go with latest version of docker avail, docker-ce 19.03.x, and a newer debian version.

TidyHuang

comment created time in 23 days

issue commentdocker/for-linux

COPY failed: stat /var/lib/docker/tmp/docker-builder

Do you have a .dockerignore file somewhere in the directory that the Dockerfile is building from? If so, docker will intentionally skip files.

Can you provide steps for somebody else to reproduce the same issue you have so it can be investigated further?

d3pr3553d

comment created time in 23 days

pull request commentmoby/moby

Improve rootless Docker overlay support detection

@tonistiigi fyi

Caligatio

comment created time in 23 days

push eventdocker/engine

Sebastiaan van Stijn

commit sha 6d8fbacea2d68dadd02391078d0f7b147ddf11f8

Configure log-format earlier, and small refactor Some messages are logged before the logrus format was set, therefore resulting in inconsistent log-message formatting during startup; Before this patch; ``` dockerd --experimental WARN[0000] Running experimental build INFO[2018-11-24T11:24:05.615249610Z] libcontainerd: started new containerd process pid=132 INFO[2018-11-24T11:24:05.615348322Z] parsed scheme: "unix" module=grpc ... ``` With this patch applied; ``` dockerd --experimental WARN[2018-11-24T13:41:51.199057259Z] Running experimental build INFO[2018-11-24T13:41:51.200412645Z] libcontainerd: started new containerd process pid=293 INFO[2018-11-24T13:41:51.200523051Z] parsed scheme: "unix" module=grpc ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 1edf943dc7b6fc56050ac028a79ba4dc83e7fbe7) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Arash Deshmeh

commit sha 1bda75eefd67dcabb9ac8573f843ab41c81156c4

migrated container wait integration tests from integration-cli to integration/container package Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com> (cherry picked from commit 7073aa8a3a0b8e7fdbda5ad7c174fb66cfd384fc) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Akihiro Suda

commit sha 5cde2dd26a0b8f8d552e13fd0b81649ed3c23e8f

[18.09] integration/internal: add new test options Test changes, taken from 596cdffb9fdea5323ccd7196f196544912b59c1f git cherry-pick -s -S -x 596cdffb9fdea5323ccd7196f196544912b59c1f git reset -- \ api/server/router/container/container_routes.go \ api/swagger.yaml \ api/types/mount/mount.go \ container/mounts_unix.go \ daemon/cluster/convert/container.go \ daemon/oci_linux.go \ daemon/volumes_unix.go \ volume/mounts/linux_parser.go \ docs/api/version-history.md \ integration/container/mounts_linux_test.go git checkout -- \ api/server/router/container/container_routes.go \ api/swagger.yaml \ api/types/mount/mount.go \ container/mounts_unix.go \ daemon/cluster/convert/container.go \ daemon/oci_linux.go \ daemon/volumes_unix.go \ volume/mounts/linux_parser.go \ docs/api/version-history.md \ integration/container/mounts_linux_test.go mount: add BindOptions.NonRecursive (API v1.40) This allows non-recursive bind-mount, i.e. mount(2) with "bind" rather than "rbind". Swarm-mode will be supported in a separate PR because of mutual vendoring. Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp> (cherry picked from commit 596cdffb9fdea5323ccd7196f196544912b59c1f) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Andrei Vagin

commit sha 7985bd80e273895d5c18538a0b2a693726d9fd9a

integration/container: add a base test for C/R Signed-off-by: Andrei Vagin <avagin@gmail.com> (cherry picked from commit bd4fff38cc7eef5b9ea4051217f6221790f48018) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Andrei Vagin

commit sha 4ac5dbaf5bda2d7137b22245ab8afeec98f5f0fa

Fix CheckpointList A container checkpoint directory doesn't have config.json. Signed-off-by: Andrei Vagin <avagin@gmail.com> (cherry picked from commit 0b96bf891c64d6c707a0831466c53c16c8d99e02) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Sebastiaan van Stijn

commit sha 9fa7f6c2d7cfb65271ca893d0ef8ba5fca56917b

Temporarily disable TestCheckpoint Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 23fec5025dacbfef7a1c497147c7c0ff0dcb729f) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Sebastiaan van Stijn

commit sha 9f02d3b3fdb80ee8df9998194ebc45ae3bceb642

integration: change network.CreateNoError signature to fix linting Line 30: warning: context.Context should be the first parameter of a function (golint) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit caec45a37faf351afc82cb6228ea2e2b48589432) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Sebastiaan van Stijn

commit sha c82cbe9d5a052291fe2286a0393d3075288d9c17

integration: change container.Create signature to fix linting ``` Line 25: warning: context.Context should be the first parameter of a function (golint) Line 44: warning: context.Context should be the first parameter of a function (golint) Line 52: warning: context.Context should be the first parameter of a function (golint) ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit b4c46b0dac0d74fed8b8adc56cbb7f55788e4916) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Sebastiaan van Stijn

commit sha 85c5aab3f53907dfcdbe18a839eaa90b08f00449

integration: change container.Run signature to fix linting Line 59: warning: context.Context should be the first parameter of a function (golint) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 9f9b4290b92bab7d0adca1f3a2bf404f013d7ef5) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Sebastiaan van Stijn

commit sha 2eb2aaf8b5a961a98d0e54e21096e1f23c7569f1

integration: change createAmbiguousNetworks signature to fix linting Line 30: warning: context.Context should be the first parameter of a function (golint) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 123e29f44aa9fb39f7ee5cb42c94b4d7bbe8ba82) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Sebastiaan van Stijn

commit sha e91e9c3571ed977ca4880018cdb53e25d65d9608

integration: change testGraphDriver signature to fix linting Line 441: warning: context.Context should be the first parameter of a function (golint) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit dac5710b689fc6e0614c6b20a11017ad30e907f8) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Tibor Vass

commit sha 4005149f469a3c5183156b0b72ff3c0066cf03d4

integration: get tests to compile again Signed-off-by: Tibor Vass <tibor@docker.com> (cherry picked from commit a2812895154da7a32a1b24a0535b5cba4088eb89) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Sebastiaan van Stijn

commit sha e9bd47ad50d549fe4af35cced36bd5a1cc5062ce

Revert "integration: have container.Create call compile" This reverts commit 584c0857ab21895e62feac686448085113c6c977. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Sebastiaan van Stijn

commit sha 4aae081a0513c83362d1fc0cee264a0581c4ad4d

Revert "Fixing integration test" This reverts commit 614daf117112e8c9576967764281cc6fe617bbb2. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

selansen

commit sha a5620fc5a62718506118eeec5c5001f5abc79bac

TestServiceWithDefaultAddressPoolInit Looks like TestServiceWithDefaultAddressPoolInit is failing randomly in CI. I am not able to reproduce the issue locally but this has been reported few times. So I tried to modify code and see if I can fix the random failure. Signed-off-by: selansen <elango.siva@docker.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 88578aa9e9c3deaf634acc53d1460ac3e4d17e03) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Arko Dasgupta

commit sha 93de6ed21eba4202fcc6fac2002a4981d66e7e63

Add TC to check dyanmic subnet for ingress network Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com> (cherry picked from commit 084f5ab5c8ccc7d5513d1b751bac505e5b5e8221) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Kir Kolyshkin

commit sha 8c60be3be4048b08a154df274afaff05b7bfba14

integration-cli/build: don't panic A lack of check in the test code can lead to a panic due to `len(ids)` being `0`. Avoid the panic by adding appropriate checks. Note `Assert()` should be used rather than `Check()` as if it fails we should not proceed with the test. Originally found in https://github.com/moby/moby/pull/38404. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 7e7ff2a033abf87438efe472b5b4c823be09ad48) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Aleksa Sarai

commit sha e42b14a598365cd0ed08876daa3ccf1da83b7211

*: remove interfacer linter from CI It has been declared deprecated by the author, and has a knack for false-positives (as well as giving bad advice when it comes to APIs -- which is quite clear when looking at "nolint: interfacer" comments). Signed-off-by: Aleksa Sarai <asarai@suse.de> (cherry picked from commit d283c7fa2b93e00d4e1b0feaee99028b00dd775d) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Aleksa Sarai

commit sha 5c1aea727396e998eea866d9bb95e589d083c015

integration-cli: don't build -test images if they already exist There's no need to try to re-build the test images if they already exist. This change makes basically no difference to the upstream integration test-suite running, but for users who want to run the integration-cli suite on a host machine (such as distributions doing tests) this change allows images to be pre-loaded such that compilers aren't needed on the test machine. However, this does remove the accidental re-compilation of nnp-test, as well as handling errors far more cleanly (previously if an error occurred during a test build, further tests won't attempt to rebuild it). Signed-off-by: Aleksa Sarai <asarai@suse.de> (cherry picked from commit 175b1d783013b7e73f117f512e1179ee3b66a697) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Aleksa Sarai

commit sha 6cc5e98efc3b8068539befeb49ce38247c155624

internal: test/env: switch to assert.TestingT Signed-off-by: Aleksa Sarai <asarai@suse.de> (cherry picked from commit ba0afa6ba865c264e0fbcb5d5e4590d8f2748f72) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

push time in 24 days

PR merged docker/engine

Reviewers
[18.09 backport] assorted test-fixes

backports of the following PRs (more details about some conflicts when cherry-picking below):

  • https://github.com/moby/moby/pull/38266 Configure log-format earlier, and small refactor
  • https://github.com/moby/moby/pull/37516 migrate container wait integration tests from integration-cli to integration/container package
  • https://github.com/moby/moby/pull/38452 integration/container: add a base test for C/R
  • https://github.com/moby/moby/pull/38984 Temporarily disable TestCheckpoint
    • Including these PRs to help getting a cleaner cherry-pick, also, these update the Dockerfile to use a more current version or CRIU, which may be needed when we update to newer Go versions. The second PR disables the test that was added, so this is mostly dead code (for now)
  • https://github.com/moby/moby/pull/39332 Integration: change signatures to fix golint warnings
  • https://github.com/moby/moby/pull/39359 integration: get tests to compile again
  • revert 584c0857ab21895e62feac686448085113c6c977 (temporarily added in https://github.com/docker/engine/pull/286)
  • revert 614daf117112e8c9576967764281cc6fe617bbb2 (temporarily added in https://github.com/docker/engine/pull/320)
  • https://github.com/moby/moby/pull/37836 Fix flaky TestServiceWithDefaultAddressPoolInit
  • https://github.com/moby/moby/pull/39966 Add TC to check dynamic subnet for ingress network
  • https://github.com/moby/moby/pull/38411 integration-cli/build: don't panic ;)
  • https://github.com/moby/moby/pull/38853 integration-cli: don't build -test images if they already exist
  • https://github.com/moby/moby/pull/39430 Integration: remove redundant checks in IPVLAN tests
    • skipped https://github.com/docker/engine/commit/dae9bac6757af3027b06a983b8448ffa962cc071 (Integration: remove "experimental" option for IPVLAN test-daemons), because it's still experimental in 18.09
  • https://github.com/moby/moby/pull/39431 Integration: remove redundant kernel version check for MACVlan
  • https://github.com/moby/moby/pull/39468 integration-cli: remove ExecSupport check
  • https://github.com/moby/moby/pull/39469 integration-cli: remove defaultSleepImage constant
  • https://github.com/moby/moby/pull/39470 integration-cli: remove unused requirements utils
  • https://github.com/moby/moby/pull/39500 Add (hidden) flags to set containerd namespaces
    • extra commit taken from https://github.com/moby/moby/pull/37674 (Revendor Microsoft/hcsshim and go-winio, plus container/containerd). these changes were missed, because https://github.com/docker/engine/pull/60 did a manual vendor update, therefore not including the local changes
  • https://github.com/moby/moby/pull/39509 integration: fix cleanup of raft data
  • https://github.com/moby/moby/pull/39105 Optimize test daemon startup
  • https://github.com/moby/moby/pull/39452 Improve select for daemon restart tests
  • https://github.com/moby/moby/pull/39510 Don't log test initial test daemon ping failures
  • https://github.com/moby/moby/pull/39517 Fix Microsecond -> Millisecond
  • https://github.com/moby/moby/pull/39516 DockerSwarmSuite lock portIndex to work around race
  • https://github.com/moby/moby/pull/39552 Be more conservative for Windows in TestFrequency for Splunk
    • fixes https://github.com/moby/moby/issues/39544 Flaky test: TestFrequency
  • https://github.com/moby/moby/pull/38428 Testing: create new daemon (only) if needed
  • https://github.com/moby/moby/pull/39554 integration: run build session tests on non-experimental
    • relates to https://github.com/moby/moby/pull/37686 remove experimental guard for buildkit
  • https://github.com/moby/moby/pull/39557 integration-cli: increase healthcheck timeout
    • relates to https://github.com/moby/moby/issues/39499#issuecomment-512621697 flaky DockerSwarmSuite tests
  • https://github.com/moby/moby/pull/39560 Retry service updates on out of sequence errors
  • https://github.com/moby/moby/pull/39569 integration-cli: remove redundant "testrequires"
  • https://github.com/moby/moby/pull/39602 Add FromClient to test env execution
  • https://github.com/moby/moby/pull/39603 Better logging for swarm tests
  • https://github.com/moby/moby/pull/39604 hack: Remove inContainer check, it wasn't useful
  • https://github.com/moby/moby/pull/39671 Fix flaky TestServiceWithDefaultAddressPoolInit
    • fixes https://github.com/moby/moby/issues/38514 Flaky test: TestServiceWithDefaultAddressPoolInit
  • https://github.com/moby/moby/pull/38783 Windows: Disable 2 restart tests on Hyper-V isolation
  • https://github.com/moby/moby/pull/39688 integration-cli: Skip windows specific isolation requirements on non-windows
  • https://github.com/moby/moby/pull/39743 Dockerfile: update CRIU to v3.12
  • https://github.com/moby/moby/pull/39800 pkg/term: refactor TestEscapeProxyRead
  • https://github.com/moby/moby/pull/39804 integration: windows.ps1: turn defender error into a warning
  • https://github.com/moby/moby/pull/36537 LCOW: Log stderr on failures to ease diagnosis
    • to assist in cherry-picking https://github.com/moby/moby/pull/39817
  • https://github.com/moby/moby/pull/39817 TestDispatch: refactor to use subtests again, and fix linting (structcheck)
  • https://github.com/moby/moby/pull/39819 integration-cli: getContainerCount() fix trimming prefix
  • https://github.com/moby/moby/pull/39831 Fix docker inspect for dutimgVersion
  • https://github.com/moby/moby/pull/39844 Fix some bashisms/non-standard comparisons in integration tests
  • https://github.com/moby/moby/pull/39836 hack/make/binary-daemon: fix some linting issues
  • https://github.com/moby/moby/pull/39853 TestRunInteractiveWithRestartPolicy: use icmd.RunCmd instead icmd.StartCmd
    • addresses https://github.com/moby/moby/pull/39853 Flaky test: TestRunInteractiveWithRestartPolicy
  • https://github.com/moby/moby/pull/39854 hack/ci/windows.ps1: explicitly set exit code to result of tests
  • https://github.com/moby/moby/pull/39876 integration-cli: update TestCreateWithWorkdir for Hyper-V isolation
  • https://github.com/moby/moby/pull/39877 hack/ci/windows.ps1: add support for DOCKER_STORAGE_OPTS
  • https://github.com/moby/moby/pull/39878 hack/ci/windows.ps1: stop tailing logs after stopping the daemon
  • https://github.com/moby/moby/pull/39884 Fix Service TTY test so signal handlers work
  • https://github.com/moby/moby/pull/39886 integration-cli: don't load busybox image on every daemon start
  • https://github.com/moby/moby/pull/39887 Windows: skip flaky TestLogBlocking
  • https://github.com/moby/moby/pull/39968 awslogs: fix flaky TestLogBlocking unit test
  • https://github.com/moby/moby/pull/39889 Fix more signal handling issues in tests
  • https://github.com/moby/moby/pull/39945 Disable TestPsListContainersFilterExited (Windows)
    • relates to https://github.com/moby/moby/issues/20819 Flaky test:
  • https://github.com/moby/moby/pull/39965 integration-cli: run goimports
  • https://github.com/moby/moby/pull/39930 hack/test/unit: fix custom TESTFLAGS not working

Steps followed:

# https://github.com/moby/moby/pull/38266 Configure log-format earlier, and small refactor
git cherry-pick -s -S -x 1edf943dc7b6fc56050ac028a79ba4dc83e7fbe7

# https://github.com/moby/moby/pull/37516 migrate container wait integration tests from integration-cli to integration/container package
git cherry-pick -s -S -x 7073aa8a3a0b8e7fdbda5ad7c174fb66cfd384fc

Only including the new test-utilities added in moby/moby/38003, as they are used by other tests now
git cherry-pick -s -S -x 596cdffb9fdea5323ccd7196f196544912b59c1f


git reset -- \
	api/server/router/container/container_routes.go \
	api/swagger.yaml \
	api/types/mount/mount.go \
	container/mounts_unix.go \
	daemon/cluster/convert/container.go \
	daemon/oci_linux.go \
	daemon/volumes_unix.go \
	volume/mounts/linux_parser.go \
	docs/api/version-history.md \
	integration/container/mounts_linux_test.go


git checkout -- \
	api/server/router/container/container_routes.go \
	api/swagger.yaml \
	api/types/mount/mount.go \
	container/mounts_unix.go \
	daemon/cluster/convert/container.go \
	daemon/oci_linux.go \
	daemon/volumes_unix.go \
	volume/mounts/linux_parser.go \
	docs/api/version-history.md \
	integration/container/mounts_linux_test.go

Including these PRs to help getting a cleaner cherry-pick, also, these update the Dockerfile
to use a more current version or CRIU, which may be needed when we update to newer Go versions

The second PR disables the test that was added, so this is mostly dead code (for now)

# https://github.com/moby/moby/pull/38452 integration/container: add a base test for C/R
git cherry-pick -s -S -x \
	bd4fff38cc7eef5b9ea4051217f6221790f48018 \
	0b96bf891c64d6c707a0831466c53c16c8d99e02

Minor conflict in the first commit, because we already backported https://github.com/moby/moby/pull/39635

# https://github.com/moby/moby/pull/38984 Temporarily disable TestCheckpoint
git cherry-pick -s -S -x 23fec5025dacbfef7a1c497147c7c0ff0dcb729f


# https://github.com/moby/moby/pull/39332 Integration: change signatures to fix golint warnings
git cherry-pick -s -S -x \
	caec45a37faf351afc82cb6228ea2e2b48589432 \
	b4c46b0dac0d74fed8b8adc56cbb7f55788e4916 \
	9f9b4290b92bab7d0adca1f3a2bf404f013d7ef5 \
	123e29f44aa9fb39f7ee5cb42c94b4d7bbe8ba82 \
	dac5710b689fc6e0614c6b20a11017ad30e907f8

# https://github.com/moby/moby/pull/39359 integration: get tests to compile again
git cherry-pick -s -S -x a2812895154da7a32a1b24a0535b5cba4088eb89

# revert 584c0857ab21895e62feac686448085113c6c977 (temporarily added in https://github.com/docker/engine/pull/286)
git revert -s -S 584c0857ab21895e62feac686448085113c6c977

# revert 614daf117112e8c9576967764281cc6fe617bbb2 (temporarily added in https://github.com/docker/engine/pull/320)
git revert -s -S 614daf117112e8c9576967764281cc6fe617bbb2


first commit (caec45a37faf351afc82cb6228ea2e2b48589432):
	deleted by us:   integration/container/run_linux_test.go -> because https://github.com/moby/moby/pull/37043 is not yet in 18.09
	both modified:   integration/network/service_test.go     -> because https://github.com/moby/moby/pull/38102 is not yet in 18.09

second commit (b4c46b0dac0d74fed8b8adc56cbb7f55788e4916):

	both modified:   integration/container/ipcmode_linux_test.go      -> because TestIpcModeOlderClient is not yet in 18.09
	deleted by us:   integration/container/run_cgroupns_linux_test.go -> because https://github.com/moby/moby/pull/38377 is not in 18.09
	both modified:   integration/internal/container/container.go      -> because https://github.com/moby/moby/pull/38377 is not in 18.09

third commit (9f9b4290b92bab7d0adca1f3a2bf404f013d7ef5):

	both modified:   integration/container/mounts_linux_test.go       -> because https://github.com/moby/moby/pull/38003 is not yet in 18.09
	deleted by us:   integration/container/run_cgroupns_linux_test.go -> because https://github.com/moby/moby/pull/38377 is not in 18.09
	deleted by us:   integration/container/run_linux_test.go          -> because https://github.com/moby/moby/pull/37043 is not yet in 18.09
	both modified:   integration/container/update_linux_test.go       -> because https://github.com/moby/moby/pull/32519 is not yet in 18.09


# https://github.com/moby/moby/pull/37836 Fix flaky TestServiceWithDefaultAddressPoolInit
git cherry-pick -s -S -x 88578aa9e9c3deaf634acc53d1460ac3e4d17e03

# https://github.com/moby/moby/pull/39966 Add TC to check dynamic subnet for ingress network
# NOTE: not yet merged upstream, so git commit may not be found there
git cherry-pick -s -S -x 084f5ab5c8ccc7d5513d1b751bac505e5b5e8221

# https://github.com/moby/moby/pull/38411 integration-cli/build: don't panic ;)
git cherry-pick -s -S -x 7e7ff2a033abf87438efe472b5b4c823be09ad48

# https://github.com/moby/moby/pull/38853 integration-cli: don't build -test images if they already exist
git cherry-pick -s -S -x \
	d283c7fa2b93e00d4e1b0feaee99028b00dd775d \
	175b1d783013b7e73f117f512e1179ee3b66a697 \
	ba0afa6ba865c264e0fbcb5d5e4590d8f2748f72


# https://github.com/moby/moby/pull/39430 Integration: remove redundant checks in IPVLAN tests
git cherry-pick -s -S -x \
	1e4bd2623a37b8083a7c5f8a93068be2c63f491c \
# skipped because it's still experimental in 18.09
#	dae9bac6757af3027b06a983b8448ffa962cc071 \
	93b28677bffcdaf299969c4ff1603b7d07b45fbc \
	4060a7026c0ffa2983ab1fa41d43da4937ef63c6

# https://github.com/moby/moby/pull/39431 Integration: remove redundant kernel version check for MACVlan
git cherry-pick -s -S -x \
	691eb142561818b0ca2255e2e340cbea6b91d80c \
	316e16618f8c794b8e56e223ed0bed15e1f4be24


# https://github.com/moby/moby/pull/39468 integration-cli: remove ExecSupport check
git cherry-pick -s -S -x 7204341950c6c8f0a66f9bb0b082217dc0ce6ddb

# https://github.com/moby/moby/pull/39469 integration-cli: remove defaultSleepImage constant
git cherry-pick -s -S -x 27f432ca57fb6d4d0409fc3c5358b74feae228cc

# https://github.com/moby/moby/pull/39470 integration-cli: remove unused requirements utils
git cherry-pick -s -S -x c887b09abc7d4ae149a9c314f74f9c351ac4cba2

# https://github.com/moby/moby/pull/39500 Add (hidden) flags to set containerd namespaces

http://github.com/containerd/containerd/compare/9754871865f7fe2f4e74d43e2fc7ccd237edcbce...3f42445e38d1081f4b8c3b8d7d1ed1860198ed7a

git cherry-pick -s -S -x 5accd8263497809ec8bab1d01251986d139bb380 
-> taken from https://github.com/moby/moby/pull/37674 Revendor Microsoft/hcsshim and go-winio, plus container/containerd
these changes were missed, because https://github.com/docker/engine/pull/60 did a manual vendor update, therefore not including the local changes

git cherry-pick -s -S -x 24ad2f486d92681080a8e257760b047f8de2c71c


	both modified:   cmd/dockerd/config.go -> minor conflict, because https://github.com/moby/moby/pull/38050 changed the signature to allow returning an error. Resolved by suppressing the error from "markhidden"


# https://github.com/moby/moby/pull/39509 integration: fix cleanup of raft data
git cherry-pick -s -S -x 6a64a4deecf5b7519d3748023765f79628059f80


# https://github.com/moby/moby/pull/39105 Optimize test daemon startup
git cherry-pick -s -S -x \
	20ea8942b86b271f49c25aa70c53f7ca38571a2c \
	595987fd082165b0c5739993b374bb5b6fa3f466

second commit added logs to code that isn't yet in 18.09, so I skipped those parts:

	both modified:   cmd/dockerd/daemon.go
	both modified:   cmd/dockerd/daemon_unix.go



# https://github.com/moby/moby/pull/39452 Improve select for daemon restart tests
git cherry-pick -s -S -x 402433a5e4b8a74cab404658f34e6520e71df00a

# https://github.com/moby/moby/pull/39510 Don't log test initial test daemon ping failures
git cherry-pick -s -S -x 15675e28f1e3ba25f3abd099c14a7800c8bae2b8

# https://github.com/moby/moby/pull/39517 Fix Microsecond -> Millisecond
git cherry-pick -s -S -x 5d818213ff3b9f8cda8e4fb3b071bef8fab782ad

# https://github.com/moby/moby/pull/39516 DockerSwarmSuite lock portIndex to work around race
git cherry-pick -s -S -x c096225e8ee6cb36e363ac38de4e4a566cf09918

# https://github.com/moby/moby/pull/39552 Be more conservative for Windows in TestFrequency for Splunk
git cherry-pick -s -S -x a5c420ac54f07dbc84bcdea91b83364a25f1c921

# https://github.com/moby/moby/pull/38428 Testing: create new daemon (only) if needed
git cherry-pick -s -S -x b3407d20295890c4e66aaabc043d9a4a872b6130

# https://github.com/moby/moby/pull/39554 integration: run build session tests on non-experimental
git cherry-pick -s -S -x becd29c6651dffc253027e15f903ae7e7c918594

# https://github.com/moby/moby/pull/39557 integration-cli: increase healthcheck timeout
    # relates to https://github.com/moby/moby/issues/39499#issuecomment-512621697 flaky DockerSwarmSuite tests

git cherry-pick -s -S -x 8c9362857f352548b94bc39c675d558b4da0d3b3

# https://github.com/moby/moby/pull/39560 Retry service updates on out of sequence errors
git cherry-pick -s -S -x 1de914695b7d0c9affc97a6da4198548da2f5f78

# https://github.com/moby/moby/pull/39569 integration-cli: remove redundant "testrequires"
git cherry-pick -s -S -x 7f37d99ef50b4046284ecb3c3b290319acf11405

# https://github.com/moby/moby/pull/39602 Add `FromClient` to test env execution
git cherry-pick -s -S -x 1381956499d357dcae47dd1239d4f35b176fea7d

# https://github.com/moby/moby/pull/39603 Better logging for swarm tests
git cherry-pick -s -S -x b0fe0dff7a5b7f70e2d08e59f4773c40e48e5c0d

# https://github.com/moby/moby/pull/39604 hack: Remove inContainer check, it wasn't useful
git cherry-pick -s -S -x f5cd8fdd446750a749182f3410adc6f1968053ca

# https://github.com/moby/moby/pull/39671 Fix flaky TestServiceWithDefaultAddressPoolInit
    # fixes https://github.com/moby/moby/issues/38514 Flaky test: TestServiceWithDefaultAddressPoolInit
 
git cherry-pick -s -S -x \
	f3a3ea0d3c7f4d4da035db871d3c8a8bbb51371f \
	a65dee30fc36ed974940b699ed22ab9242eac6cf


	both modified:   integration/network/service_test.go -> because https://github.com/moby/moby/pull/38102 is not in 18.09

# https://github.com/moby/moby/pull/38783 Windows: Disable 2 restart tests on Hyper-V isolation
git cherry-pick -s -S -x faaffd5d6d7f143619c2bbefc818c40ffbf92523

# https://github.com/moby/moby/pull/39688 integration-cli: Skip windows specific isolation requirements on non-windows
git cherry-pick -s -S -x b469933b063169718987865b8b1215cb7befd1a6

minor conflicts, because 18.09 didn't move from go-check to gotest

	both modified:   integration-cli/docker_cli_restart_test.go
	both modified:   integration-cli/docker_cli_run_test.go

# https://github.com/moby/moby/pull/39743 Dockerfile: update CRIU to v3.12
git cherry-pick -s -S -x 00ad0222cef8024f19394e2e9d5dc0e05f0ec982

# https://github.com/moby/moby/pull/39800 pkg/term: refactor TestEscapeProxyRead
git cherry-pick -s -S -x 556d26c07d068d92fd896428ab4ac890554239d7

# https://github.com/moby/moby/pull/39804 integration: windows.ps1: turn defender error into a warning
git cherry-pick -s -S -x 31885181fcc0ca0cacd6c12f6c64ac553ff2bc2b

# https://github.com/moby/moby/pull/36537 LCOW: Log stderr on failures to ease diagnosis
to assist in cherry-picking https://github.com/moby/moby/pull/39817
git cherry-pick -s -S -x 63f9c7784b7c6a726c8c668d68f9c8cb13e19ffb

# https://github.com/moby/moby/pull/39817 TestDispatch: refactor to use subtests again, and fix linting (structcheck)
git cherry-pick -s -S -x a3f9cb5b635a76484a926289bfa4fc6feee1763a

# https://github.com/moby/moby/pull/39819 integration-cli: getContainerCount() fix trimming prefix
git cherry-pick -s -S -x 02c9b0674fe2cf43def3a1e625cab74a0db8136a

# https://github.com/moby/moby/pull/39831 Fix docker inspect for dutimgVersion
git cherry-pick -s -S -x 52a53e2587e34d45b1d4a9b7b7d307ad51c5b0b0

# https://github.com/moby/moby/pull/39844 Fix some bashisms/non-standard comparisons in integration tests
git cherry-pick -s -S -x \
	dbde4786e48531f095f9c3ecaff0f57b838abefc \
	32f1c651623421ee1ac480b200d34025a74436bb

# https://github.com/moby/moby/pull/39836 hack/make/binary-daemon: fix some linting issues
git cherry-pick -s -S -x 70d36778252124d7cec0489ed98d1bac475d9727
some conflicts, because rootless kit is not in 18.09

# https://github.com/moby/moby/pull/39853 TestRunInteractiveWithRestartPolicy: use `icmd.RunCmd` instead `icmd.StartCmd`
git cherry-pick -s -S -x e6fce00ec83df2f23523b836f647b8f3df97953f

# https://github.com/moby/moby/pull/39854 hack/ci/windows.ps1: explicitly set exit code to result of tests
git cherry-pick -s -S -x \
	8e8c52c4abe011a4cf3334da0726ef1fc0d17b14 \
	7eb522a2350d759cf6a9aad493ac1b8ffc3d3335

# https://github.com/moby/moby/pull/39876 integration-cli: update TestCreateWithWorkdir for Hyper-V isolation
git cherry-pick -s -S -x ac9ef840ef94ff66266d3d8b9d32caf570d3b93f

# https://github.com/moby/moby/pull/39877 hack/ci/windows.ps1: add support for DOCKER_STORAGE_OPTS
git cherry-pick -s -S -x b6f596c4112818109441c84d313cf38fa06d6768

# https://github.com/moby/moby/pull/39878 hack/ci/windows.ps1: stop tailing logs after stopping the daemon
git cherry-pick -s -S -x e1636ad5fa1351c3edc20dd9006fb4d6f63c9f69

# https://github.com/moby/moby/pull/39884 Fix Service TTY test so signal handlers work
git cherry-pick -s -S -x e6c5563ae9d083cc72fcf84796c542047ac0a299

# https://github.com/moby/moby/pull/39886 integration-cli: don't load busybox image on every daemon start
git cherry-pick -s -S -x \
	8fc23588f1aa14054f1134e60dd996220c595363 \
	ead3f4e7c8b7add7beb2de44649b38f41947180f

# https://github.com/moby/moby/pull/39887 Windows: skip flaky TestLogBlocking 
git cherry-pick -s -S -x 6c75c862403c98138ab0f7811f6ba9113f9e5d61

# https://github.com/moby/moby/pull/39968 awslogs: fix flaky TestLogBlocking unit test
git cherry-pick -s -S -x fd94bae0b8acc451a79667dd1cef4c583d532187

# https://github.com/moby/moby/pull/39889 Fix more signal handling issues in tests
git cherry-pick -s -S -x fcd65ebf49a858c4f6223d1b1db728f7400a3b6d

	both modified:   integration-cli/docker_cli_userns_test.go -> because https://github.com/moby/moby/pull/39902 is not in 18.09

# https://github.com/moby/moby/pull/39945 Disable TestPsListContainersFilterExited (Windows)
TestPsListContainersFilterExited
git cherry-pick -s -S -x 7de4e130898fc1cf74f8c4fec24416c3f7d3589b

# https://github.com/moby/moby/pull/39965 integration-cli: run goimports
git cherry-pick -s -S -x 5b7347c312161da0b64c551fee70c111ff5c9ec6

# pushed an extra commit here, to change `skip.If` to `testRequires`

# https://github.com/moby/moby/pull/39930 hack/test/unit: fix custom TESTFLAGS not working
git cherry-pick -s -S -x 0620990307aaf8ada706ffb6c5dc0628c92d84af
+1116 -794

7 comments

123 changed files

thaJeztah

pr closed time in 24 days

push eventdocker/engine

Kunal Kushwaha

commit sha ce74774c096b1abcf872b45a3aa15c08120ff0c7

builder entitlements configutation added. buildkit supports entitlements like network-host and security-insecure. this patch aims to make it configurable through daemon.json file. by default network-host is enabled & secuirty-insecure is disabled. Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com> (cherry picked from commit 8b7bbf180fc65013bc9ec0269b4a475d3eb038ee) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Andrew Hsu

commit sha 370def6b30a6566bc6a3413ad1b5bac37a82db16

Merge pull request #412 from thaJeztah/19.03_backport_builder_entitilement_confg [19.03 backport] builder entitlements configuration added.

view details

push time in 24 days

PR merged docker/engine

[19.03 backport] builder entitlements configuration added. impact/changelog

backport of https://github.com/moby/moby/pull/39144

relates to:

  • https://github.com/moby/buildkit/issues/950 Implement entitlement security.unconfined
  • https://github.com/moby/buildkit/pull/1081 Implement frontend support for RUN --security=insecure

buildkit supports entitlements like network-host and security-insecure. this patch aims to make it configurable through daemon.json file. by default network-host is enabled & security-insecure is disabled.

- What I did option to enable/disable buildkit's entitlements settings for moby fixes part of issue discussed here https://github.com/moby/buildkit/issues/950#issuecomment-484790342

- How I did it Added entitlements in builder config

- Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: -->

- A picture of a cute animal (not mandatory but encouraged)

+21 -5

1 comment

2 changed files

thaJeztah

pr closed time in 24 days

push eventdocker/engine

Tibor Vass

commit sha 1e26b431c944402e62f0e652362b54ac24925cfc

daemon/config: fix filter type in BuildKit GC config For backwards compatibility, the old incorrect object format for builder.GC.Rule.Filter still works but is deprecated in favor of array of strings akin to what needs to be passed on the CLI. Signed-off-by: Tibor Vass <tibor@docker.com> (cherry picked from commit fbdd437d295595e88466b33a550a8707b9ebb709) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Tibor Vass

commit sha dae4436d1c742c88bba1a4e50a46f38f87f7ae17

daemon/config: add MarshalJSON for future proofing If anything marshals the daemon config now or in the future this commit ensures the correct canonical form for the builder GC policies' filters. Signed-off-by: Tibor Vass <tibor@docker.com> (cherry picked from commit 85733620ebea3da75abe7d732043354aa0883f8a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Sebastiaan van Stijn

commit sha e5a0bc6a50ef924ed6c0f333693857ab22ca47fa

Add GoDoc to fix linting validation The validate step in CI was broken, due to a combination of 086b4541cf9d27d9c2654f316a6f69b0d9caedd9, fbdd437d295595e88466b33a550a8707b9ebb709, and 85733620ebea3da75abe7d732043354aa0883f8a being merged to master. ``` api/types/filters/parse.go:39:1: exported method `Args.Keys` should have comment or be unexported (golint) func (args Args) Keys() []string { ^ daemon/config/builder.go:19:6: exported type `BuilderGCFilter` should have comment or be unexported (golint) type BuilderGCFilter filters.Args ^ daemon/config/builder.go:21:1: exported method `BuilderGCFilter.MarshalJSON` should have comment or be unexported (golint) func (x *BuilderGCFilter) MarshalJSON() ([]byte, error) { ^ daemon/config/builder.go:35:1: exported method `BuilderGCFilter.UnmarshalJSON` should have comment or be unexported (golint) func (x *BuilderGCFilter) UnmarshalJSON(data []byte) error { ^ ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 9d726f1c18216a127572310fccb0fab8fcfdc678) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Andrew Hsu

commit sha e2e3abec71f30e533a01e8f1f9669e55b1361fc1

Merge pull request #410 from thaJeztah/19.03_backport_fix_buildkit_prunegc_filter_config [19.03 backport] daemon/config: fix filter type in BuildKit GC config

view details

push time in 24 days

PR merged docker/engine

Reviewers
[19.03 backport] daemon/config: fix filter type in BuildKit GC config

backport of

  • https://github.com/moby/moby/pull/39979 daemon/config: fix filter type in BuildKit GC config
    • fixes https://github.com/moby/moby/issues/39601 "Example Buildkit GC configuration results in daemon error"
  • https://github.com/moby/moby/pull/40118 Add GoDoc to fix linting validation

- Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: -->

- A picture of a cute animal (not mandatory but encouraged)

+104 -5

0 comment

4 changed files

thaJeztah

pr closed time in 24 days

push eventdocker/engine

Brian Goff

commit sha fd169c00bf19a392276d52867c1a5032d22b7b21

Propagate GetContainer error from event processor Before this change we just accept that any error is "not found" and it could be something else, but even if it it is just a "not found" kind of error this should be dealt with from the container store and not the event processor. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 54e30a62d3ca39c912c8e291e80cfbf80860d607) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

view details

Andrew Hsu

commit sha 0e8949a003204b63f4c55cb5beb38754efed020c

Merge pull request #407 from thaJeztah/19.03_backport_better_container_error [19.03 backport] Propagate GetContainer error from event processor

view details

push time in 24 days

more