toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,575 Commits 3 Branches 295 Tags
1dcf6652c8f081e75dbd58c4c29d84b78059b6c5
Commit Graph
39575 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jose-bigio 1dcf6652c8 Create 18.02 Changelog 
Signed-off-by: jose-bigio <jose.bigio@docker.com>
 2018-01-24 16:28:30 -08:00
GordonTheTurtle ae55d43f2e Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-01-23 17:04:13 +00:00
GordonTheTurtle 6c6e8038c9 Merge component 'engine' from git@github.com:moby/moby master 2018-01-23 17:04:07 +00:00
GordonTheTurtle ad2946faa1 Merge component 'cli' from git@github.com:docker/cli master 2018-01-23 16:41:06 +00:00
Yong Tang 544ec9eef9 Merge pull request #36019 from thaJeztah/improve-config-reload 
improve daemon config reload; log active configuration
Upstream-commit: 99cfb5f31ad82238573de3475bf5bb0435ac1ebc
Component: engine
 2018-01-22 17:58:25 -08:00
Andrew Hsu d67508be5d Merge pull request #77 from sargun/master 
Add pigz to recommended packages
Upstream-commit: a6543ceeff408dfa9cbb4e75d013bc05bda09c32
Component: packaging
 2018-01-22 17:35:51 -08:00
Andrew Hsu dbb0b294c6 Merge pull request #81 from seemethere/add_dev_rpm 
Add dev portion to RPM package version
Upstream-commit: 208ba254d788a0d7bfe4dde92b35b9f2f68aa1d6
Component: packaging
 2018-01-22 17:35:16 -08:00
Sebastiaan van Stijn 2b99ce1d23 Merge pull request #816 from dnephin/binary-native 
Add dockerfile for building on non-amd64 platforms
Upstream-commit: b6a628c295
Component: cli
 2018-01-22 16:14:23 -08:00
Sebastiaan van Stijn 8c17001e4f Merge pull request #826 from dnephin/fix-lint-errors 
Fix lint on master
Upstream-commit: f2529443a0
Component: cli
 2018-01-22 15:16:38 -08:00
Eli Uriegas 5cec7a6e2f Add dev portion to RPM package version 
-dev was being removed, per legacy code, but we'd like to add it back
into the naming so that deb / rpm packages will look mostly the same
when compiled with a `-dev` version.

RPMS end up looking like:

docker-ce-18.02.0.ce-0.0.dev.git20180120.170357.0.fa4fb35.el7.centos.x86_64.rpm

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 65e2c3cf9ff8c3130e628a455e3d02921876cdfc
Component: packaging
 2018-01-22 23:10:48 +00:00
Daniel Nephin bc95dc9fb3 Fix merge conflict 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ae03b006a6
Component: cli
 2018-01-22 18:09:47 -05:00
Vincent Demeester 50c6561a9e Merge pull request #35949 from yongtang/34248-carry 
Carry #34248 Added tag log option to json-logger and use RawAttrs
Upstream-commit: ea74dbe907f534ba2f59c1173330987c3fa84208
Component: engine
 2018-01-22 15:02:54 -08:00
Vincent Demeester 928478219f Merge pull request #36013 from thaJeztah/improve-version-middleware-test 
Improve API version-middleware test
Upstream-commit: fbed4eb8c72f56437f2a451f9cd9405814882e2a
Component: engine
 2018-01-22 14:59:06 -08:00
Vincent Demeester e3d68b9fea Merge pull request #780 from thaJeztah/fix-network-add 
Fix --network-add adding duplicate networks
Upstream-commit: fbb9de2cfc
Component: cli
 2018-01-22 14:45:58 -08:00
Eli Uriegas 739f4e49fc Merge pull request #79 from seemethere/remove_f25_aarch64 
Removes fedora 25 aarch64 Dockerfile
Upstream-commit: 44a1f4887d9ac3b6cbb08ab779c9e84109b906ba
Component: packaging
 2018-01-22 12:15:43 -08:00
Eli Uriegas 40f1f3c105 Removes fedora 25 aarch64 Dockerfile 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 9f717788b588a48d494abe42d7c392bf8fe458d9
Component: packaging
 2018-01-22 19:10:56 +00:00
Sebastiaan van Stijn 36e0e57cbe Log active configuration when reloading 
When succesfully reloading the daemon configuration, print a message
in the logs with the active configuration:

    INFO[2018-01-15T15:36:20.901688317Z] Got signal to reload configuration, reloading from: /etc/docker/daemon.json
    INFO[2018-01-14T02:23:48.782769942Z] Reloaded configuration: {"mtu":1500,"pidfile":"/var/run/docker.pid","data-root":"/var/lib/docker","exec-root":"/var/run/docker","group":"docker","deprecated-key-path":"/etc/docker/key.json","max-concurrent-downloads":3,"max-concurrent-uploads":5,"shutdown-timeout":15,"debug":true,"hosts":["unix:///var/run/docker.sock"],"log-level":"info","swarm-default-advertise-addr":"","metrics-addr":"","log-driver":"json-file","ip":"0.0.0.0","icc":true,"iptables":true,"ip-forward":true,"ip-masq":true,"userland-proxy":true,"disable-legacy-registry":true,"experimental":false,"network-control-plane-mtu":1500,"runtimes":{"runc":{"path":"docker-runc"}},"default-runtime":"runc","oom-score-adjust":-500,"default-shm-size":67108864,"default-ipc-mode":"shareable"}

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8378dcf46d017c70df97d6f851e0196b113b422e
Component: engine
 2018-01-21 00:56:02 +01:00
Sebastiaan van Stijn c2b247fce6 Move reload-related functions to reload.go 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6121a8429b9d3a6d20e900c521c2f50fff5db406
Component: engine
 2018-01-21 00:55:49 +01:00
Sebastiaan van Stijn d093175f6e Merge pull request #696 from mlaventure/attach-use-containerwait 
attach: Use ContainerWait instead of Inspect
Upstream-commit: 44a1168ae5
Component: cli
 2018-01-20 23:55:16 +01:00
Sebastiaan van Stijn c9b8ded195 Merge pull request #35919 from yongtang/35333-carry 
Carry #35333: Devicemapper: ignore Nodata errors when delete thin device
Upstream-commit: db5c006bc8654ab1e4c24a1a9f460bbe4039686e
Component: engine
 2018-01-20 18:47:16 +01:00
GordonTheTurtle fa4fb352fe Merge component 'engine' from git@github.com:moby/moby master 2018-01-20 17:03:57 +00:00
Akihiro Suda dbd159de4c Merge pull request #36065 from Microsoft/jjh/bumprs3andlcowsupported 
Bump to RS3 final build, and remove LCOW_SUPPORTED
Upstream-commit: ef3f7d18da40cda7f33858b787161773d7656714
Component: engine
 2018-01-20 19:53:30 +09:00
Anusha Ragunathan bde2b4704d Merge pull request #35830 from cpuguy83/unbindable_shm 
Make container shm parent unbindable
Upstream-commit: c162e8eb417bbc124c1f89f676aea081ebb6251f
Component: engine
 2018-01-19 17:43:30 -08:00
Vincent Demeester 946a37c1e4 Merge pull request #35744 from ndeloof/35702 
closes #35702 introduce « exec_die » event
Upstream-commit: f97256cbf1811740cfa9a72f705c8a70195cd468
Component: engine
 2018-01-19 15:03:50 -08:00
Brian Goff 2859d16079 Merge pull request #35986 from thaJeztah/bump-containerd-1.0.1-rc1 
Bump containerd to 1.0.1 (9b55aab90508bd389d7654c4baf173a981477d55)
Upstream-commit: 47a0dcbcd20aa2924c89a38a16a60907506ae4f2
Component: engine
 2018-01-19 15:48:36 -05:00
Brian Goff 30c97f4539 Merge pull request #36003 from pradipd/upgrade_fix 
Fixing ingress network when upgrading from 17.09 to 17.12.
Upstream-commit: 949ee0e5297408e97c9b5444d500a2cecab06609
Component: engine
 2018-01-19 15:46:50 -05:00
John Howard 5e6be7b1c2 Bump RS3 final build, and remove LCOW_SUPPORTED 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5b24976ad4046a9c071b75df31d9269ad2e84732
Component: engine
 2018-01-19 12:22:56 -08:00
Vincent Demeester 12ceea25e6 Merge pull request #36051 from Microsoft/jjh/remotefs-read-return-error 
LCOW remotefs - return error in Read() implementation
Upstream-commit: 3c9d023af3428f49241a2e2385dae43151185466
Component: engine
 2018-01-19 11:27:13 -08:00
Yong Tang 621663ea5d Merge pull request #36061 from adampointer/36060-fix-name-clash 
Alias container and network packages to stop name clashes 
Upstream-commit: 507b8be5b3c02d2b99393d5613a6a59071e13786
Component: engine
 2018-01-19 09:53:06 -08:00
Yong Tang 3cf8a0c442 Carry 34248 Added tag log option to json-logger and use RawAttrs 
This fix carries PR 34248: Added tag log option to json-logger

This fix changes to use RawAttrs based on review feedback.

This fix fixes 19803, this fix closes 34248.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e77267c5a682e2c5aaa32469f2c83c2479d57566
Component: engine
 2018-01-19 17:51:20 +00:00
bonczj 9dd65d097b Added tag log option to json-logger 
Fixes #19803
Updated the json-logger to utilize the common log option
'tag' that can define container/image information to include
as part of logging.

When the 'tag' log option is not included, there is no change
to the log content via the json-logger. When the 'tag' log option
is included, the tag will be parsed as a template and the result
will be stored within each log entry as the attribute 'tag'.

Update: Removing test added to integration_cli as those have been deprecated.
Update: Using proper test calls (require and assert) in jsonfilelog_test.go based on review.
Update: Added new unit test configs for logs with tag. Updated unit test error checking.
Update: Cleanup check in jsonlogbytes_test.go to match pending changes in PR #34946.
Update: Merging to correct conflicts from PR #34946.

Signed-off-by: bonczj <josh.bonczkowski@gmail.com>
Upstream-commit: 5f50f4f511cd84e79bf005817af346b1764df27f
Component: engine
 2018-01-19 17:41:19 +00:00
GordonTheTurtle 3c3132fc24 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-01-19 17:04:04 +00:00
GordonTheTurtle 06609b9304 Merge component 'engine' from git@github.com:moby/moby master 2018-01-19 17:03:58 +00:00
GordonTheTurtle c973e2ff26 Merge component 'cli' from git@github.com:docker/cli master 2018-01-19 16:41:06 +00:00
Brian Goff d00d4e32b9 Merge pull request #34859 from Microsoft/jjh/singleimagestore 
LCOW: Coalesce daemon stores, allow dual LCOW and WCOW mode
Upstream-commit: bb6ce897378b4ebd0131fd835b01ad5f9af3ebb9
Component: engine
 2018-01-19 11:38:30 -05:00
Adam Pointer ed76e0e519 Alias container and network packages to stop name clashes 
Signed-off-by: Adam Pointer <adam.pointer@gmx.com>
Upstream-commit: 7732ca94fc67a28cbd37c292dc29216255685eba
Component: engine
 2018-01-19 10:26:41 +00:00
John Howard ebd586c561 LCOW remotefs - return error in Read() implementation 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6112ad6e7d5d7f5afc698447da80f91bdbf62720
Component: engine
 2018-01-18 17:46:58 -08:00
Eli Uriegas 58e2db872f Add pigz to docker-ce spec files 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: cee72837c3dd20296d436c48e48f30c3e7b17e7c
Component: packaging
 2018-01-19 00:22:00 +00:00
Sargun Dhillon 0b18a391f5 Add pigz to recommended packages 
This change is in response to https://github.com/moby/moby/pull/35697
It adds pigz to the recommended binaries that should be installed with
docker-ce.

Signed-off-by: Sargun Dhillon <sargun@sargun.me>
Upstream-commit: 1ca014b9440a92b46e2e03d879c03ddc5c51d4c0
Component: packaging
 2018-01-18 15:51:57 -08:00
Brian Goff 46bc3ffbc5 Merge pull request #817 from vdemeester/make-manifest-cmd-experimental 
Mark docker-manifest command as experimental (cli)
Upstream-commit: da86425e9f
Component: cli
 2018-01-18 17:46:15 -05:00
Vincent Demeester ac28efa249 Mark docker-manifest command as experimental (cli) 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2d29732f40
Component: cli
 2018-01-18 13:19:33 -08:00
Vincent Demeester e94c45a5c9 Merge pull request #138 from clnperez/manifest-cmd 
Add manifest command
Upstream-commit: 11dfa23a5d
Component: cli
 2018-01-18 22:15:49 +01:00
John Howard 3ca8db9a46 Remove OS() from layer interface 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c94d34f783944ff6586846ccd11e86925fcee171
Component: engine
 2018-01-18 12:56:28 -08:00
Eli Uriegas 676b242a5f Merge pull request #71 from ZeuAlex/rpm_build_aarch64 
Aarch64 rpm support 
Upstream-commit: 4cc70e4be06cd19edfbcdab4619bc3c271a4a04c
Component: packaging
 2018-01-18 12:55:53 -08:00
John Howard 40b95b8e94 Address feedback from Tonis 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 0cba7740d41369eee33b671f26276325580bc07b
Component: engine
 2018-01-18 12:30:39 -08:00
Vincent Demeester 9e8b44781f Merge pull request #35965 from thaJeztah/fix-volume-create-statuscode 
Return 400 status instead of 500 for empty volume create body
Upstream-commit: 39377bb96d459d2ef59bd2bad75468638a7f86a3
Component: engine
 2018-01-18 20:02:33 +01:00
Sebastiaan van Stijn b4c44961cf Merge pull request #36030 from cpuguy83/quota_update 
Ensure CPU quota/period updates are sent to runc
Upstream-commit: 0fa3962b8d8d78020c7e636c4bcea14d618929e1
Component: engine
 2018-01-18 19:54:10 +01:00
Daniel Nephin 3fa889eb3f Add dockerfile for building on non-amd64 platforms 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 02ca1c8573
Component: cli
 2018-01-18 13:16:58 -05:00
GordonTheTurtle 86ca16658d Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-01-18 17:04:03 +00:00
GordonTheTurtle 3ee93da859 Merge component 'engine' from git@github.com:moby/moby master 2018-01-18 17:03:57 +00:00