Andrew Hsu
b1e2655de1
bump ver to 18.09.0-ce-tp4
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2018-08-24 22:24:43 +00:00
GordonTheTurtle
357d520355
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09
2018-08-24 19:54:36 +00:00
Eli Uriegas
bcac5c18d0
Merge pull request #160 from dhiltgen/fix_scope
...
[18.09] Make engine scope a build time setting
Upstream-commit: 4a425676ac9183011f84fafda1a103fe93121dd1
Component: packaging
2018-08-24 12:01:27 -07:00
Daniel Hiltgen
66e16d32fe
Make engine scope a build time setting
...
This should make it easier to change downstream builds
to change the scope.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 72406691244c12d5360889f8658bd4989b588364
Component: packaging
2018-08-24 11:40:42 -07:00
Eli Uriegas
ca36ebeff9
Merge pull request #550 from seemethere/v
...
[18.09] bump version to 18.09.0-ce-tp3
2018-08-23 11:02:40 -07:00
Eli Uriegas
b5ee375fd4
bump version to 18.09.0-ce-tp3
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2018-08-23 17:59:49 +00:00
GordonTheTurtle
6ac22f3d8e
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09
2018-08-23 17:53:11 +00:00
GordonTheTurtle
0ee2fe2920
Merge component 'engine' from git@github.com:docker/engine 18.09
2018-08-23 17:53:02 +00:00
Eli Uriegas
5e417d9bd2
Merge pull request #158 from andrewhsu/ac
...
[18.09] use systemctl is-active to check for containerd
Upstream-commit: 7e5cc1a95e11a48148f1972d625322ae1399c0bc
Component: packaging
2018-08-23 09:59:48 -07:00
Andrew Hsu
51edf81efb
use systemctl is-active to check for containerd
...
The other way was not working.
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
(cherry picked from commit f00df1bf1efa2ed1ea508ea7b1c291500441571d)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: a9b0387bb0f40bd7687d8653a0714724eb66f3b9
Component: packaging
2018-08-23 16:57:41 +00:00
Eli Uriegas
97dd93e978
Merge pull request #157 from seemethere/remove_overlay_1809
...
[18.09] Remove overlay as the default storage driver
Upstream-commit: 54dc76c596e5f5fe8ee76e65a0ac601f8a1d8e8b
Component: packaging
2018-08-23 09:44:14 -07:00
Eli Uriegas
dc460e810c
Remove overlay as the default storage driver
...
Should rely on list in the daemon
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit 605758124d0750c14d24bfb1ebcf77d102591f4a)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 6cc81c2e8c95127baac275750bc544452fec7799
Component: packaging
2018-08-23 16:39:44 +00:00
Eli Uriegas
dbb89de17a
Merge pull request #155 from seemethere/fix_up_dockerfile_1809
...
[18.09] Fix up Dockerfile.engine to compile docker-proxy statically
Upstream-commit: 9162117ba4c76ad329c4c4abeab02b91e76cbd4c
Component: packaging
2018-08-23 08:50:54 -07:00
Eli Uriegas
6c6bc2f8c9
Remove linux-headers as a dependency
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 82258262f90bfaca3a2ef14e6b53238c2fac3147
Component: packaging
2018-08-23 15:08:24 +00:00
Tibor Vass
46e2c8ce3b
Merge pull request #35 from tiborvass/18.09-fix-network-buildkit
...
[18.09] builder: fix bridge networking when using buildkit
Upstream-commit: be371291bcbf5ce89ed5d9122d046ff18f8fdaba
Component: engine
2018-08-23 06:21:34 -07:00
Tibor Vass
cb322aa233
builder: fix bridge networking when using buildkit
...
Signed-off-by: Tibor Vass <tibor@docker.com >
(cherry picked from commit dc7e472db986fa3c07806f56e82db756c47567fb)
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 1d531ff64f99e07ac8733894416de8212a6c7278
Component: engine
2018-08-23 05:32:51 +00:00
Eli Uriegas
45b43d2050
Wire up dependencies for debian, source -> .
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit 99bbb6e33f46b6e2621204aac3b05344783ccfaa)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 3aeb8e9365fefea1be6e6b64624fccb81d5a70ad
Component: packaging
2018-08-22 23:28:39 +00:00
Eli Uriegas
adca33ea9c
Fix whitespace, add Dockerfile.engine to clean
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit 831482a3296e9a7b1ad10f6b8c850a7a4095b881)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: ce1d295cf4f7049dc48813d825511a85ebf7e9c1
Component: packaging
2018-08-22 23:28:39 +00:00
Eli Uriegas
cea6d4e302
Make GO_IMAGE configurable, default to official go
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit 4cdbe08bf929d5c731b61e1cea217fa40156a3a8)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 5bfb6ce9464fea13abc71fb6c12b9f5cb01a29a4
Component: packaging
2018-08-22 23:28:39 +00:00
Andrew Hsu
4bb0619413
Merge pull request #548 from seemethere/ignore_tars
...
[18.09] Ignore tar's
2018-08-22 10:58:23 -07:00
Eli Uriegas
df8a9dde61
Ignore tar's
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2018-08-22 17:56:22 +00:00
Andrew Hsu
729a38cb5a
Merge pull request #546 from seemethere/gitignore_1809
...
[18.09] Update gitignore to ignore more files
2018-08-22 10:05:12 -07:00
Eli Uriegas
f57c2cbfc8
Update gitignore to ignore more files
...
We're messing with git porcelain checks
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2018-08-22 17:01:28 +00:00
Eli Uriegas
85c21a40b5
Merge pull request #545 from andrewhsu/new
...
[18.09] update new 18.09 branch
2018-08-21 22:25:49 -07:00
Andrew Hsu
83021751fa
update for new 18.09 branch
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2018-08-22 05:23:08 +00:00
GordonTheTurtle
b02cbd3734
Bump version to 18.09.0-ce-rc1
...
Signed-off-by: GordonTheTurtle <engine-team@docker.com >
2018-08-22 05:03:35 +00:00
GordonTheTurtle
8880c3ba4f
Merge branch 'master' of github.com:docker/docker-ce
2018-08-22 05:01:10 +00:00
GordonTheTurtle
deaac15230
Merge component 'engine' from git@github.com:docker/engine master
2018-08-22 05:01:00 +00:00
GordonTheTurtle
aa9377e7ab
Merge component 'engine' from git@github.com:docker/engine master
2018-08-22 04:57:57 +00:00
Tibor Vass
b1b684bc76
Merge pull request #37691 from tiborvass/tmp-disable-bridge
...
builder: temporarily disable bridge networking when using buildkit
Upstream-commit: 3ba4f9b2212d617057f0fe570aa8481b65d5b276
Component: engine
2018-08-21 20:41:57 -07:00
Tibor Vass
ebad0ccbe4
builder: temporarily disable bridge networking when using buildkit
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 16084ea8c82fe3b3a0aae2573def0d1857365408
Component: engine
2018-08-22 03:29:17 +00:00
Tibor Vass
b9ccf0e1c6
Merge pull request #37688 from tiborvass/features-not-flat
...
Fix logic when enabling buildkit
Upstream-commit: ef50da44b30dd041896cfc6be45b777e10cc1d75
Component: engine
2018-08-21 18:56:41 -07:00
GordonTheTurtle
6c90f5dd52
Merge component 'cli' from git@github.com:docker/cli master
2018-08-22 00:14:18 +00:00
Sebastiaan van Stijn
a610952c4f
Merge pull request #1303 from thaJeztah/remove_buildkit_experimental_annotations
...
Remove "experimental" annotations for buildkit
Upstream-commit: 08cf36daa6
Component: cli
2018-08-22 00:57:27 +01:00
Tibor Vass
65b88273a4
Merge pull request #37684 from thaJeztah/add_remote_api_warning
...
Add warning if REST API is accessible through an insecure connection
Upstream-commit: 1cc3deebc40733fb6dcd98fbb5412399dc764876
Component: engine
2018-08-21 16:52:37 -07:00
Tibor Vass
ed97b30d09
Fix logic when enabling buildkit
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: c973cde7606dc7a2557094fc90d8e6bb595fa354
Component: engine
2018-08-21 23:49:08 +00:00
Tibor Vass
821e8ae86c
Merge pull request #37686 from andrewhsu/bk-no-ex
...
remove experimental guard for buildkit
Upstream-commit: 9972a826c81630ed6136a198586ae4a36c6f9dfe
Component: engine
2018-08-21 16:43:46 -07:00
Sebastiaan van Stijn
ab4d7a2303
Move "session" support out of experimental for API 1.39 and up
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a500c394df
Component: cli
2018-08-22 00:51:19 +02:00
Andrew Hsu
2594f77b01
move /session api endpoint out of experimental
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 01c9e7082eba71cbe60ce2e47acb9aad2c83c7ef
Component: engine
2018-08-21 22:43:34 +00:00
Sebastiaan van Stijn
ab525d6a99
Remove "experimental" annotations for buildkit
...
BuildKit can now be enabled without the daemon having
experimental features enabled.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 60c75fda67
Component: cli
2018-08-22 00:38:59 +02:00
Andrew Hsu
cea4607c21
remove experimental guard for buildkit
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 239047c2d36706f2826b0a9bc115e0a08b1c3d27
Component: engine
2018-08-21 22:19:45 +00:00
Sebastiaan van Stijn
c0b7cd4ffb
Merge pull request #37636 from thaJeztah/add_swarm_label_tests
...
Add unit test for swarm labels on containers
Upstream-commit: 3bd1e7b59b0bf4ee4e581e1d27c49aee7987f1f1
Component: engine
2018-08-21 23:02:46 +01:00
GordonTheTurtle
e5f0e2d12d
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-08-21 21:03:58 +00:00
Tibor Vass
fc316c8fb4
Merge pull request #1225 from thaJeztah/told_you_so_I_wont_warn_you_again
...
Use warnings provided by daemon
Upstream-commit: ca782599fb
Component: cli
2018-08-21 13:42:16 -07:00
GordonTheTurtle
0528c321e1
Merge component 'cli' from git@github.com:docker/cli master
2018-08-21 20:36:57 +00:00
Sebastiaan van Stijn
d6a674adf4
Use warnings provided by daemon
...
Warnings are now generated by the daemon, and returned as
part of the /info API response.
If warnings are returned by the daemon; use those instead
of generating them locally.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3c27ce21c9
Component: cli
2018-08-21 22:29:57 +02:00
Sebastiaan van Stijn
5c668597be
bump docker/docker
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7da71329bc
Component: cli
2018-08-21 22:29:43 +02:00
Sebastiaan van Stijn
7469deec1a
Add warning if REST API is accessible through an insecure connection
...
The remote API allows full privilege escalation and is equivalent to
having root access on the host. Because of this, the API should never
be accessible through an insecure connection (TCP without TLS, or TCP
without TLS verification).
Although a warning is already logged on startup if the daemon uses an
insecure configuration, this warning is not very visible (unless someone
decides to read the logs).
This patch attempts to make insecure configuration more visible by sending
back warnings through the API (which will be printed when using `docker info`).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 547b993e07330f3e74cba935975fce05e8661381
Component: engine
2018-08-21 22:03:24 +02:00
Michael Crosby
e421ac528c
Merge pull request #1233 from selansen/default_addr_pool
...
Global Default Address Pool feature support
Upstream-commit: e97d004395
Component: cli
2018-08-21 14:55:24 -04:00
selansen
534b83a7cb
Global Default Address Pool feature support
...
This feature brings new attribute/option for swarm init command.
default-addr-pool will take string input which can be in below format.
"CIDR,CIDR,CIDR...:SUBNET-SIZE".
Signed-off-by: selansen <elango.siva@docker.com >
Upstream-commit: 587a94c935
Component: cli
2018-08-21 14:34:00 -04:00