The split between docker-ce and docker (moby) was initially
quite different, and docker-ce was more of a reference versus
a supported / working package.
Upstream has evolved such that both are valid options, and
may be chosen due to different requirements.
Rather than duplicating all the settings, we can move the
dependencies, init, rdepends, users, etc, into a .inc file and
share them.
For now, we keep the build separate, since depending on the
uprev status, they still can require different build options
and packaging.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
With the 5.0 kernel and docker 18.09 you can run into issues
pulling from docker hub due to an invalid/unknown certificate.
We fix that by adding ca-certifcates as a runtime dependency.
There can also be isuses setting up the network bridge, so we
add bridge-utils to the rdepends.
We also add some comments about this recipe and how it should
be updated using moby (and why it is like it is).
Finally, no one wants rt-tests and lxc when installing docker,
so we drop them from the rsuggests.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
With the 5.0 kernel and docker 18.09 you can run into issues
pulling from docker hub due to an invalid/unknown certificate.
We fix that by adding ca-certifcates as a runtime dependency.
There can also be isuses setting up the network bridge, so we
add bridge-utils to the rdepends.
Finally, no one wants rt-tests and lxc when installing docker,
so we drop them from the rsuggests.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Upreving the moby variant of the docker runtime to match
the 18.09.3 updates that are in the docker-ce recipe.
The signficant comments (engine), are as follows:
667e800b2c bump swarmkit to 415dc72789e2b733ea884f09188c286ca187d8ec
fc01c2b481 Merge pull request #37874 from justincormack/remove-libtrust
5a7d6dcf21 Merge pull request #38820 from bynnchapu/mkimage-yum_add-new-tag-option
57c2228cc1 Add new option to specify tag information
6e86b1198f Merge pull request #38780 from thaJeztah/remove_parse_tmpfs_options
13b7d11be1 Remove Schema1 integration test suite
98fc09128b Remove the rest of v1 manifest support
8aca18d631 Merge pull request #38813 from cpuguy83/add_experimental_interface
fa9df85c6a Had `HasExperimental()` to cluster backend
9c83848fc9 Merge pull request #38808 from alexellis/derek/add_pr_description_required
45eae4cb2b Merge pull request #38806 from tonistiigi/rootless-build-fixes
5c152ea10f Merge pull request #38810 from thaJeztah/network_dangling_docs
989d497d51 Merge pull request #38565 from dave-tucker/jenkinsfile
f9b9d5f584 builder-next: fixes for rootless mode
dc52692458 Merge pull request #38675 from thaJeztah/refactor_pkg_sysinfo
ca91918dd4 docs follow-ups for networks "dangling" filter
ed681c5c0d Merge pull request #38805 from thaJeztah/better_polling
3c9b9409e2 Update Derek behaviour
8df160dde7 Merge pull request #38790 from nakabonne/refactor-setting-graph-driver
ba641fef28 Merge pull request #31551 from KarthikNayak/dry_run
348d793351 Merge pull request #38737 from thaJeztah/fix_stopped_restart_containers
8c0ecb6387 Fix stopped containers with restart-policy showing as "restarting"
91d934b41b Merge pull request #38791 from thaJeztah/update_api_changes
131cbaf5b7 Network: add support for 'dangling' filter
67d6f174ae Add more details to RunningTasksCount
de7172b600 Merge pull request #38782 from Microsoft/fix-restart
501cb131a7 Merge pull request #38800 from dani-docker/esc-1090
4d7721cdcc Add Jenkinsfile
8073c4febd Merge pull request #38786 from gaorong/installer-shell-interpreter
3fbbeb703c set bigger grpc limit for GetConfigs api
5e77399b92 fix hack/dockerfile/install/containerd.installer test statement
19c5ff9c64 Merge pull request #38792 from thaJeztah/update_api_changelog
95faf3582c Merge pull request #38428 from thaJeztah/only_create_new_daemon_if_needed
5861a0db22 Fix container update resetting pidslimit on older API clients
fc77445147 Add new PidsLimit options to API version history
894ecb24d1 Merge the divided loops
dd94555787 Merge pull request #32519 from darkowlzz/32443-docker-update-pids-limit
308438c1ec Merge pull request #38783 from Microsoft/jjh/restarthypertests
b3407d2029 Testing: create new daemon (only) if needed
faaffd5d6d Windows:Disable 2 restart test when Hyper-V
5afe2705ac Windows: Fix restart for Hyper-V containers
144c95029c pkg/mount: remove unused ParseTmpfsOptions
74eb258ffb Add pids-limit support in docker update
cbb885b07a Merge pull request #38632 from dperny/gmsa-support
0e54f5e3a9 Merge pull request #38686 from cpuguy83/remove_deprecated_newclient
9688f120a2 Merge pull request #38758 from thaJeztah/add_missing_char_device_mode
c7a38c2c06 Graphdriver: fix "device" mode not being detected if "character-device" bit is set
6f1d7ddfa4 Use Runtime target
7403497573 Merge pull request #38756 from kolyshkin/fix-test-int
447ce1325d Merge pull request #38741 from Microsoft/jjh/signalname
228bc35e82 make test-integration: use correct dockerd binary
c093c1e08b Merge pull request #38718 from thaJeztah/update_containerd_1.2.4
733a69e26b Windows:Update dumpstack event name
fcb286895b Merge pull request #38364 from cpuguy83/fix_stale_container_on_start
5ba30cd1dc Delete stale containerd object on start failure
818d2ddf02 Merge pull request #38730 from AkihiroSuda/rootlesskit-030alpha2
206004e3a7 Merge pull request #38728 from AkihiroSuda/fix-rootless-stick-xdg
f1a87919e0 bump up rootlesskit (fix CentOS failure)
56bea903ef dockerd: call StickRuntimeDirContents only in rootless mode
defb2b57a7 Update containerd client to 1.2.4
26413ede57 Update containerd runtime 1.2.4
0111ee7087 Merge pull request #38717 from thaJeztah/update_containerd_1.2.3
a327428bdb Merge pull request #38716 from thaJeztah/bump_runc_cve_2019-5736
c4763e02d1 Update containerd to 1.2.3
f03698b69a Update runc to 6635b4f (fix CVE-2019-5736)
6800954050 Merge pull request #38677 from tiborvass/fix-validate
f18cf23e97 Merge pull request #38692 from Microsoft/jjh/runtime-spec
98dcded647 Merge pull request #38701 from thaJeztah/bump_gorilla_mux
477eeef60c Bump gorilla/mux to 1.7.0
832ce62cb2 Merge pull request #38693 from tiborvass/fix-timeout-bug
42dcfc894a hack: Have TIMEOUT take -test.count into account when testing for flakiness
9f1b2b7031 Vendor opencontainers/runtime-spec 29686dbc
e063099f91 Completely remove `d.NewClient` from testing tools
e6fe7f8f29 Merge pull request #38685 from yongtang/go-vet
611b23c1a0 Merge pull request #38580 from andrey-ko/fix-restart
86312a4732 Fix go-vet issue
c63a2b7619 Merge pull request #38678 from Microsoft/jjh/lcowpushspace
f8e29fdd68 Merge pull request #38679 from AkihiroSuda/rootlesskit-030alpha1
6501a8ff90 Merge pull request #38684 from tonistiigi/vpnkit-restore
61da822eeb Merge pull request #38683 from tonistiigi/ptrace-seccomp-update
2c79d3520a Merge pull request #38681 from Microsoft/jjh/hcsshim086
20e8572a4c hack: restore bundling vpnkit on amd64
f091a8dd62 Merge pull request #38680 from Microsoft/jjh/dumpduterr
e76380b67b seccomp: review update
07742515fb Vendor Microsoft/hcsshim @ v0.8.6
bc80e8df3e Windows CI: Dump possible panic log
bcc4c03092 bump up rootlesskit (fix armv7 compilation failure)
1603af9689 Merge pull request #38137 from tonistiigi/seccomp-ptrace
feb70fd5c9 hack: no need to git fetch in CI
20383d504b Add support for using Configs as CredentialSpecs in services
04995fa7c7 Add CredentialSpec from configs support
2c8522b0a3 LCOW:Enable image push when files have spaces
e7a9a7cdbc Merge pull request #35355 from x1022as/unless-stop
8e06006717 Merge pull request #37296 from yusuf-gunaydin/lcow_limits
53460047e4 Refactor pkg/sysinfo
93d994e29c Merge pull request #38050 from AkihiroSuda/rootless
ec87479b7e allow running `dockerd` in an unprivileged user namespace (rootless mode)
86bd2e9864 Implemented memory and CPU limits for LCOW.
50e63adf30 Merge pull request #38574 from StefanScherer/improve-no-matching-manifest-error
b17188be39 Merge pull request #38673 from thaJeztah/fix_proto_capitalization
8e293be4ba fix unless-stopped unexpected behavior
b462bba1b0 Bump SwarmKit to fix proto capitalization
d440fea460 Merge pull request #38655 from thaJeztah/override_validate
acf08532a7 Merge pull request #38520 from thaJeztah/fix_update_status_check
94429d4078 Remove use of serviceSpecIsUpdated
0e60e48134 Bump swarmkit to 1a0ebd43b2d156983a695f90e56f4ecba6ced902
87903f2fb5 Merge pull request #38609 from kwojcicki/enhancement/38518-docker_info_builder_version
8a43b7bb99 Merge pull request #38570 from thaJeztah/keep_your_head_up
fc4a40b510 Merge pull request #38658 from thaJeztah/use_stable_cli
7e7e100be0 Add HEAD support for /_ping endpoint
393838ca5e Merge pull request #38569 from thaJeztah/forget_about_it
22e4f12e5f Merge pull request #38653 from sreis/38636-fix-nil-pointer-dereference
468eb93e5a Use 17.06 stable channel for CLI used in CI
5a2f15b5d5 Merge pull request #38625 from thaJeztah/remove_docs_role
2a08f33166 Allow overriding repository and branch in validate scripts
44af96c0fc Merge pull request #38634 from kolyshkin/cp-longname
3134161be3 Fix nil pointer derefence on failure to connect to containerd
0d9dc3f4b5 Merge pull request #38604 from thaJeztah/remove_deprecated_newclient
8b10292153 Merge pull request #38644 from yongtang/fatalf
5fba9b32b3 Merge pull request #38635 from JoeWrightss/patch-3
3a4bb96ab7 Remove use of deprecated client.NewClient()
5801c04345 Merge pull request #38380 from olljanat/capabilities-support
0cde75e2ea Merge pull request #38398 from RaviTezu/replace_gotty_with_aec
f04e8bb075 Fatalf -> Fatal
6351619e2c Merge pull request #38606 from thaJeztah/move_client_opts
974294600f Fix some typos in ROADMAP.md
f55a4176fe pkg/archive:CopyTo(): fix for long dest filename
27c7178933 Merge pull request #38629 from thaJeztah/bump_golang_1.11.5
20b34412dc Bump Golang 1.11.5 (CVE-2019-6486)
e017717d96 keep old network ids
de86ba27fb Merge pull request #38598 from yongtang/serviceRunningTasksCount
89ce20fa25 Merge pull request #38603 from thaJeztah/remove_deprecated_daemonhost
2cb25409c2 Remove "docs maintainers" section
528ca931e6 Merge pull request #38621 from fntlnz/fix/reviewing-merge-label
c133553154 REVIEWING.md: Fix status 4 merge label
0ecba1523d Merge pull request #38422 from debayande/even-more-names-redux
80d7bfd54d Capabilities refactor - Add support for exact list of capabilities, support only OCI model - Support OCI model on CapAdd and CapDrop but remain backward compatibility - Create variable locally instead of declaring it at the top - Use const for magic "ALL" value - Rename `cap` variable as it overlaps with `cap()` built-in - Normalize and validate capabilities before use - Move validation for conflicting options to validateHostConfig() - TweakCapabilities: simplify logic to calculate capabilities
f821f002e5 Adding builder version
8d7889e510 Merge pull request #38605 from thaJeztah/explicit_nilerror_check
69d9ff3455 Move deprecated client constructors to a separate file
01eb35bfb3 Move client-opts to a separate file
3449b12cc7 Use assert.NilError() instead of assert.Assert()
3105ca26dc integration-cli: remove deprecated daemonHost() utility
e485a60e2b Move serviceRunningTasksCount to integration/internal/swarm
1990a3e409 replace gotty with aec, since gotty hasn't been updated since very long time and aec can drop in for gotty Signed-off-by: RaviTeja Pothana <ravi-teja@live.com>
5ec31380a5 Merge pull request #38481 from thaJeztah/run_volume_tests_remotely
64fd09bd29 Merge pull request #38553 from thaJeztah/faster_api_node_drain_pause
bba833928c Merge pull request #38487 from LinuxMercedes/error-on-empty-dockerfile
0dc531243d Merge pull request #38554 from thaJeztah/check_for_errors
4b9db209fe Improve 'no matching manifest' error
5ebb679598 Merge pull request #38544 from thaJeztah/dont_sprintf
cd60e8a752 Merge pull request #38547 from yongtang/waitAndAssert
e21f50cbf0 Merge pull request #38572 from yongtang/assert.NilError
b5be9f63eb Merge pull request #38567 from thaJeztah/use_the_skip
38015177d8 Merge pull request #38557 from thaJeztah/remove_duplicated_code
a827f17306 Merge pull request #38552 from thaJeztah/improve_test_events_filter_labels
508e5f7b70 Merge pull request #37974 from thaJeztah/add_more_component_versions
834801a4e5 Merge pull request #38568 from thaJeztah/fix_ping_test
52475f8dd5 Replace t.Fatal(err) with assert.NilError(t, err)
a0674481ee Merge pull request #38566 from thaJeztah/fix_task_logs_swagger
68e266ee3a Replace waitAndAssert in config_test.go with poll.WaitOn
18c7e8b927 Test: dockerfiles with no instructions are detected
64466b0cd9 Convert parse errors to more informative format
d104a750f9 Update buildkit version -- improved parse errors
8472e04f79 Merge pull request #38555 from yongtang/assert.NilError
ef91b404ef Merge pull request #38524 from thaJeztah/update_docker_py
b8277edd9c Merge pull request #38546 from thaJeztah/wait_a_second
2137b8ccf2 Add containerd, runc, and docker-init versions to /version
5f788fbf56 Add Cache-Control headers to disable caching /_ping endpoint
46b80550c1 Fix ping-tests using wrong status-code
c11be31710 TestCgroupDriverSystemdMemoryLimit: use skip.If()
5ccc0714f7 Swagger: fix "task logs" outside of "tasks" section
beef00cb26 Merge pull request #38558 from thaJeztah/pass_client_instead_of_daemon
a3f626d101 Merge pull request #38543 from thaJeztah/save_the_environment
56a68c15f8 Integration tests: remove some duplicated code, and preserve context
60d93aab2e Refactor TestInspectNetwork
8172edf04c GetRunningTasks: pass client instead of daemon
0e15c02465 Make TestEventsFilterLabels less flaky
32f6aeee8a Replace t.Fatal(err) with assert.NilError(err)
2e326eba70 Add missing error-check in TestAPISwarmManagerRestore
ebdc9a3afc Slightly speed up TestAPISwarmNodeDrainPause
ebc0750e9f Merge pull request #38459 from JoeWrightss/patch-2
1ac557c506 Merge pull request #38548 from yongtang/networkIsRemoved
28b7824caa Remove code duplication and consolidate networkIsRemoved
e3c03d172e Merge pull request #38545 from thaJeztah/integration_on_swarm_nits
973ca00d60 reduce flakiness of TestSwarmLockUnlockCluster and TestSwarmJoinPromoteLocked
8f158db4ed pkg/signal.TestTrap: use a subtest
c855d411bf testing: pkg/signal; remove redundant fmt.Sprintf()
ead47f0a83 no need to set exec.Env to os.Environ() as it's the default
b84bff7f8a Fix: plugin-tests discarding current environment
ad2765b35e Merge pull request #38523 from olljanat/flaky-test-finder
c7444a4f31 Merge pull request #38537 from vdemeester/update-code-owners
295413c9d0 Merge pull request #38533 from kolyshkin/derek
89e3a4af62 fix code typo
f25972151b Merge pull request #38530 from SUSE/fix-config-segfault
66210fae70 .DEREK.yml: add myself
5d5798c7cc Merge pull request #38527 from thaJeztah/bash_the_bashisms
c0c05affc7 Update docker-py to 3.7.0
8a8fd37f6f CI: Introduce flaky test finder
3efd75b972 Merge pull request #38529 from thaJeztah/improve_make_help
4627bc8a26 Remove myself from codeowners 😅
7f3910c92e Fix possible segfault in config reload
202c9d8c98 Makefile: make help: fix newline wrapping, and missing targets
2a5405bedd Run volume-tests again remote daemons as well
37498f009d Shell scripts: fix bare variables
c3650770cc Revert "Bash scripts; use double brackets, fix bare variables, add quotes"
b4842cfe88 Merge pull request #38354 from thaJeztah/fix_ipam_swagger
3f2ecb5452 Merge pull request #38515 from yongtang/01082019-oll.WaitOn
cb501886db Merge pull request #38456 from thaJeztah/make_errdefs_idempotent
156b2abd0c Merge pull request #38472 from thaJeztah/remove_debugging_code
9dd43415ae Merge pull request #38499 from olljanat/change_serviceIsUpdated2
0492b0997b Use poll.WaitOn in authz_plugin_test.go
b868ada474 integration: Corrected service update tests logic
77df18c24a Merge pull request #38509 from thaJeztah/bump_containerd_v1.2.2
27cc170d28 Bump containerd to v1.2.2
f9dbd383bb Merge pull request #38418 from thaJeztah/mega_power
e8592828eb Merge pull request #38482 from thaJeztah/skip_consistently
263e28a830 Fix some minor wording / issues
69c0b7e476 Simplify skip checks
84224935ea Only build IPCmode tests on Linux
a3948d17d3 Improve consistency in "skip"
545d00e752 Merge pull request #38416 from thaJeztah/fix_build_session_test
f5238762a8 Merge pull request #38480 from thaJeztah/run_slow_test_parallel
16df93c231 Merge pull request #38497 from yongtang/go-vet
7315a2bb11 Fix go vet issue in daemon/daemon.go
8edcd4c3cd integration: wait for service update to be completed
2ee53a42db Merge pull request #38490 from kolyshkin/test-rename-anon-ct
55b5b8de79 Merge pull request #38486 from thaJeztah/dont_use_deprecated_envclient
926edd68a5 Merge pull request #38493 from thaJeztah/skip_kmem_tests_on_rhel
b958b430aa Merge pull request #38417 from thaJeztah/replace_newclient
0104abf0d6 Merge pull request #38409 from innovimax/patch-1
5a718ef0f9 Merge pull request #38496 from Microsoft/jjh/dockerfile.windows
6825db8c94 Merge pull request #38450 from thaJeztah/remove_deprecated_grpc_functions
3bcf582366 Add note to Dockerfile.windows
1e1156cf67 Skip kernel-memory tests on RHEL/CentOS daemons
de640c9f49 Merge pull request #38038 from AkihiroSuda/ubuntu-overlayfs
74ad4f2d2c Merge pull request #38423 from olljanat/disable-integration-tests-on-z-and-powerpc
ae3ca7bb97 Run TestImportExtremelyLargeImageWorks in parallel
2ca6896aee TestRenameAnonymousContainer: fix error msg
c8ff5ecc09 Remove use of deprecated client.NewEnvClient()
2b7e084dc9 Merge pull request #38473 from thaJeztah/use_testenv_client
e78a3dca21 Merge pull request #38477 from yongtang/38407-follow-up
0de62d9bbc Integration: use testenv.APIClient()
4d88a95d67 Don't mix t.Parallel() wth environment.ProtectAll()
264775b52b Make errdefs helpers idempotent
3f7898cfcd Merge pull request #38451 from thaJeztah/skip_test_info_warnings
9a6b704fac Merge pull request #38464 from thaJeztah/wrap_some_errors
1930e8eb2e Merge pull request #38455 from thaJeztah/add_errdefs_nil_check
0281db99a9 Follow up to PR 38407
626022d0f6 Merge pull request #38407 from maximilianomaccanti/master
f9fedf1308 TestBuildMultiStageParentConfig: remove unneeded sleep and ImageList call
e0e9942dc5 Merge pull request #38419 from thaJeztah/fix_nuke_everything
27234ffe3e Merge pull request #37564 from adshmh/migrate-docker_cli_service_update_test-to-integration-service-fixed-flake
8f93a33755 Merge pull request #35894 from joninvski/improve-syslog-logger-unit-test-coverage
744940056d client/request: wrap some errors
43a8ec654b Add missing nil-check on errdefs.Unavailable()
72b0b0387d Replace deprecated grpc.ErrorDesc() and grpc.Code() calls
f76d6a078d Merge pull request #38370 from farnasirim/36413-bind-dir-skip-copy
056840c2a6 Skip TestInfoAPIWarnings on remote daemons
53bb992c3b Merge pull request #38445 from thaJeztah/dont_use_deprecated_withdialer
8d3feccfa9 Replace deprecated client.WithDialer()
31348a2936 fix typo
e6d7df2e5d Use BuildKit to skip source code COPY if BIND_DIR set
5ddb1d410a Merge pull request #38426 from thaJeztah/remove_unused_experimental_check
c32f042e2b Merge pull request #38430 from thaJeztah/fix_prefix_double_slash
a7020454ca Add options validation to syslog logger test
be151a73f0 migrated service integration tests from integration-cli/docker_cli_service_update_test.go to integration/service
8fbf2598f5 Merge pull request #37940 from olljanat/replicas-max-per-node
5d5adcd898 Fix double slash after $PREFIX
3587efed6b Merge pull request #38414 from thaJeztah/minor_volume_tweaks
052a20f361 Merge pull request #38424 from thaJeztah/bash_da_bash_bash_bash
43b15e924f Remove SameHostDaemon, use testEnv.IsLocalDaemon instead
362f737e1c Remove unused ExperimentalDaemon, NotS390X, NotPausable requirement checks
9a3911ced8 Fix TestBuildWithSession, TestBuildSquashParent using wrong daemon during test
02157c638b Disabled these tests on s390x and ppc64le: - TestAPISwarmLeaderElection - TestAPISwarmRaftQuorum - TestSwarmClusterRotateUnlockKey
153171e9dd Added support for maximum replicas per node to services
297b30df5f Bash scripts; use double brackets, fix bare variables, add quotes
d147fe0582 Merge pull request #38413 from slp/master
e50f791d42 Makes a few modifications to the name generator.
0d6dd91e13 Move `validateOpts()` to local_unix.go as it is not used on Windows
5580b79813 PowerShell: fix "Nuke-Everything" failing to remove images
755d3057ab PowerShell: Go-version check; only select the first match
6130c89cce PowerShell: remove aliases, use their real commands instead
b394d25f03 PowerShell: move $null to left-hand for comparisons
0f8b616c0c PowerShell: fix mixed tabs/spaces
11b88be247 Remove validationError type, and use errdefs.InvalidParameter
342f7a357a Use a map[string]struct{} for validOpts
d5b271c155 add check for local volume option
2cb7b73a1b Test: Replace NewClient() with NewClientT()
ad8a8e8a9e NewStreamConfig UTest fixes
687cbfa739 Split StreamConfig from New, Utest table driven
512ac778bf Add two configurable options to awslogs driver
2cb26cfe9c Merge pull request #38301 from cyphar/waitgroup-limits
a07fbfbd15 Merge pull request #38411 from kolyshkin/dont-panic
5a52917e4d daemon: switch to semaphore-gated WaitGroup for startup tasks
ab318fa6ca Merge pull request #38403 from thaJeztah/switch_to_alpine_3.8
5846db10af layer/layer_store: ensure NewInputTarStream resources are released
7e7ff2a033 integration-cli/build: don't panic
c77afb700d Merge pull request #38402 from thaJeztah/bump_golang_1.11.4
92b34ec9c6 Merge pull request #38408 from josegonzalez/patch-1
a2d0de6559 Correct spelling error in roadmap
7c8dcebd30 Switch Dockerfile.e2e to alpine 3.8
3770f38647 Bump Golang 1.11.4
bcd817ee6b Merge pull request #38393 from thaJeztah/refactor_container_validation
170ed8d7e7 Merge pull request #38399 from thaJeztah/fix_govet_issues
7e220b3f83 Merge pull request #38266 from thaJeztah/logrus_formatting
b33dc72523 Merge pull request #38335 from yongtang/38258-syslog-rfc5424
f81cafd12b Merge pull request #38381 from thaJeztah/unify_api_version_checks
9c83124302 Fix some go_vet issues
40f245b7c8 Merge pull request #38097 from cpuguy83/roadmap.md
1edf943dc7 Configure log-format earlier, and small refactor
d1117e8e10 Merge pull request #38372 from FabianKramm/fix-darwin-compile
f6002117a4 Extract container-config and container-hostconfig validation
44b360f884 Merge pull request #38391 from olljanat/derek
5fc0f03426 Extract workingdir validation/conversion to a function
c0697c27aa Extract port-mapping validation to a function
e1809510ca Extract restart-policy-validation to a function
6a7da0b31b Extract healthcheck-validation to a function
b6e373c525 Rename verifyContainerResources to verifyPlatformContainerResources
c07d79bcc2 Merge pull request #38369 from thaJeztah/bump_golang_1.11.3
e278678705 Remove unused argument from verifyPlatformContainerSettings
10c97b9357 Unify logging container validation warnings
2e23ef5350 Move port-publishing check to linux platform-check
46c713ab5a Add curators rights for olljanat
57f1305e74 Move "OOM Kill disable" warning to the daemon
419972a714 Merge pull request #38376 from crosbymichael/bump-containerd
8422e6f6fa Merge pull request #38383 from tonistiigi/exec-ctx
c4c4963228 Unify API-version checks
332f134890 libcontainerd: prevent exec delete locking
efba5f8565 Merge pull request #38371 from farnasirim/doc-test-fix-regex
e5d9d72162 Update containerd to aa5e000c963756778ab3ebd1a12c6
eea4977d02 Fix unmount redeclaration on darwin in github.com/docker/docker/pkg/mount
c46c3c1689 Update test.md doc to fix sample test regex
6b7c093b0d Bump Golang 1.11.3 (CVE-2018-16875)
f711f2bdc3 Merge pull request #38360 from thaJeztah/fix_missing_import
d69968d6d3 Fix missing import
56cc56b0fa Merge pull request #38126 from mjameswh/fix-1715
759ad5a981 Merge pull request #38338 from Bevisy/master
f810141387 Merge pull request #38348 from Quasilyte/patch-1
f34727f704 Merge pull request #38316 from dmandalidis/xattr-fix
d4a6e1c44f Merge pull request #38068 from kolyshkin/err
a5dd68186c Swagger: fix definition of IPAM driver options
62d80835ab Merge pull request #38342 from crosbymichael/oci-refactor
560ac1c996 Merge pull request #38135 from moredhel/defer-container-interface
510805655b Merge pull request #38265 from AkihiroSuda/remove-migrate-v1
b940cc5cff Move caps and device spec utils to `oci` pkg
a5c185b994 registry: use len(via)!=0 instead of via!=nil
4555ae59e4 Merge pull request #38294 from jaswdr/issue-38096
d0192ae154 Ignore xattr ENOTSUP errors on copy (fixes#38155)
6533136961 pkg/mount: wrap mount/umount errors
90be078fe5 pkg/mount: refactor Unmount()
2f98b5f51f aufs: get rid of mount()
77bc327e24 UnmountIpcMount: simplify
8072e62d83 pkg/system/stat_unix: wrap errors in PathError
65f669331a delete unnecessary blank lines
3e44f58966 Merge pull request #38142 from thaJeztah/fix_api_return_code
ec153ccfc8 pkg/archive: add TestReexecUserNSOverlayWhiteoutConverter
037e370de1 pkg/archive: annotate tests that requires initial userns
f8ed19c8b4 pkg/archive: support overlayfs in userns (Ubuntu kernel only)
6e3113f700 Merge pull request #38327 from andrewhsu/ctrd
0cd6eabeef Merge pull request #38339 from tonistiigi/update-buildkit
126f371e47 Fix mistake in docs/contributing/test.md running specific unit test (#38096)
ce58fcedd8 Merge pull request #38292 from AkihiroSuda/fix-pkg-archive-xattr-test
32f4805815 vendor: update buildkit to d9f75920
7bfd8a7a72 Merge pull request #38336 from yongtang/12082018-go-vet
1082d1edf2 go vet fix for TestfillLicense
fa6dabf876 Add zero padding for RFC5424 syslog format
edf5134ba7 Merge pull request #38323 from nostrad/fix-deb-security-check
78045a5419 use empty string as cgroup path to grab first find
75c4b74155 vndr libnetwork to adjust for updated runc
615eecf8ac update containerd to v1.2.1
a4a816b6bb Merge pull request #38328 from andrewhsu/abbr
1014b2bb66 update just installer of containerd to 1.2.1
5a9cb68eb3 Merge pull request #38314 from gaozhenhai/master
8db540370c mkimage: Fix Debian security presence check
1895e082b6 Merge pull request #38313 from Microsoft/jjh/hcsshim08
ce67af6938 Fix log output format
05151dcc39 Windows:Bump HCSShim to v0.8.3
65d9a5dde5 Merge pull request #38267 from thaJeztah/wrap_errors
6a3d1e3e3e Unify the defer syntax
ad1354ffb4 Merge pull request #38305 from OmriShiv/master
5480e74971 Merge pull request #38299 from jaswdr/issue-38285
fe1083d462 fix typo
49217e7b2d Merge pull request #37302 from cyphar/nis-domainname
64e52ff3db Masked /proc/asound
f38ac72bca oci: add integration tests for kernel.domainname configuration
7417f50575 oci: include the domainname in "kernel.domainname"
a8d2b29e8d Use errors.Wrap() in daemon/config
a2e384682b Use idtools.LookupGroup instead of parsing /etc/group file for docker.sock ownership
baab736a36 Merge pull request #38291 from tonistiigi/builder-networking-performance
9ddd6e47a9 pkg/archive: fix TestTarUntarWithXattr failure on recent kernel
bcf1967dd0 builder: delete sandbox in a goroutine for performance
1ad272c7e4 builder: set exernalkey option for faster hook processing
852542b397 Merge pull request #38284 from cpuguy83/context_in_api
8391a667d6 Merge pull request #38281 from thaJeztah/kernel_memory_tcp_docs_touchups
1b22bc52fa Merge pull request #38282 from thaJeztah/kernel_memory_tcp_warnings
05390c4f6e Rely on request.Context() cancellation
d5916f6393 Update gorilla/mux
bb7de1f7cb Minor docs touch-ups for KernelMemoryTCP support
6f70946a27 Add warning to /info if KernelMemoryTCP is not supported
d3e75e4220 Merge pull request #37043 from yongtang/37038-kernelTCP
6fa149805c Merge pull request #37638 from jterry75/devices_windows
2555344858 Merge pull request #38278 from Microsoft/jjh/busyboxstage2
561e0f6b7f Windows: Bump busybox to v1.1
ed37f60b86 Merge pull request #38263 from gaozhenhai/master
ae7210f79d Merge pull request #38277 from Microsoft/jjh/busybox
ee74cd777a Skip KernelMemoryTCP if version is less than 1.40
f023816608 Add memory.kernelTCP support for linux
ea3ac621e3 Merge pull request #37982 from Microsoft/jjh/archive
c7a3c3cd94 Merge pull request #38239 from tiborvass/filters-clone
4a74a46f44 Update roadmap to reflect reality.
56b732058e pkg/archive fixes, and port most unit tests to Windows
14c8b67e51 Windows:Tie busybox to version
b466101d43 Fix log output when don't use formatted
b0de11cf30 Add test for status code on conflicting service names
0b7cb16dde Merge pull request #38102 from selansen/master
1fea38856a Remove v1.10 migrator
618741ba87 Merge pull request #38171 from ZYecho/fix-multi-images-filter
32180ac0c7 VXLAN UDP Port configuration support This commit contains changes to configure DataPathPort option. By default we use 4789 port number. But this commit will allow user to configure port number during swarm init. DataPathPort can't be modified after swarm init. Signed-off-by: selansen <elango.siva@docker.com>
a7ce3140f5 Vendor commit for VXLAN UDP Port configuration support This commit brings Swarmkit and Libnetwork library changes Signed-off-by: selansen <elango.siva@docker.com>
74baf62f4b Merge pull request #38245 from thaJeztah/bump_containerd_v1.2.1
5007c36d71 cli: fix images filter when use multi reference filter
c58cd154f5 Merge pull request #38231 from adshmh/bump-swarmkit-tmpfs-exec-option
b2d99865ea Add --device support for Windows
cf5d4aa1ad Merge pull request #38204 from thaJeztah/check_for_more_ipvs_options
2483e03531 Merge pull request #38238 from tiborvass/fix-38208
e6244aa598 Merge pull request #38226 from tonistiigi/nil-credentials
b1d28ee6bb Merge pull request #38244 from tonistiigi/vendor-buildkit
2fb5de68a9 Update containerd to v1.2.1-rc.0
59eacf28d6 filters: add Clone() method
6204eb0645 vendor: update buildkit to v0.3.3
62923f29f5 builder: ignore `label` and `label!` prune filters
369da264ba builder: deprecate prune filter `unused-for` in favor of `until`
bce98f9a3e bump swarmkit to bc032e24784ea618044ee438fedec3458abb2ef9 to vendor exec option for tmpfs
68cbc3712c Merge pull request #38168 from crosbymichael/ctd12
04287e4934 Merge pull request #38196 from thaJeztah/fence_default_addr_pools
6c51d0707d Merge pull request #38219 from gowalking/master
effb2bd9d2 builder: avoid unset credentials in containerd
d13528c635 wip: bump containerd and runc version
7af4c904b3 Bump containerd binary to fix shim hang
fc0038a3ed Update runc to 58592df56734acf62e574865fe40b9e53e967910
8674930c84 Update containerd to v1.2.0
287144db42 Merge pull request #38213 from thaJeztah/add_note_about_runc_vendoring
92d545552f Merge pull request #38218 from thaJeztah/fix_default_addr_pools_swagger
e6b56ffed7 Merge pull request #38216 from thaJeztah/bump_sys
f11b87bfca Merge pull request #37831 from cyphar/apparmor-external-templates
7c5cf58328 Fix a typos in layer_windows.go
2e8c913dbd Add missing default address pool fields to swagger
826da28efa Bump golang.org/x/sys to 90868a75fefd03942536221d7c0e2f84ec62a668
da3810d235 Add a note about updating runc / runc vendoring
44e1c6ce81 Add CONFIG_IP_VS_PROTO_TCP, CONFIG_IP_VS_PROTO_UDP, IP_NF_TARGET_REDIRECT to check-config.sh
7632ccbc66 Ignore default address-pools on API < 1.39
758255791e Merge pull request #38177 from mooncak/fix_duplicate
345d1fd089 Cleanup duplication in daemon files
a5e2dd2bb1 Merge pull request #38128 from kolyshkin/runc
13e9563d42 Merge pull request #38123 from thaJeztah/bump_swarmkit
279452fedd Merge pull request #38159 from thaJeztah/bump_toml_0.3.1
1e7c43dfae Merge pull request #38161 from thaJeztah/listen_very_carefully_I_shall_say_this_only_once
a7fe1ae2c2 Remove duplicate CONTRIBUTING.md
6b0b9962da Bump BurntSushi/toml to v0.3.1
06a4fd5009 Merge pull request #38141 from thaJeztah/handle_invalid_json
bd224b5fe5 Merge pull request #38003 from AkihiroSuda/non-recursive-bind
bb1914b195 Merge pull request #38125 from kangp3/add_scheme_override
c7b488fbc8 API: properly handle invalid JSON to return a 400 status
2f902930e9 Merge pull request #38143 from thaJeztah/bump_golang_1.11.2
8972aa9350 runc.installer: add nokmem build tag for rhel7 kernel
d022271796 Merge pull request #37845 from wk8/wk8/allow_arbitrary_docker_run_flags
335736fb01 Bump runc
c21c9b5fad Merge pull request #38053 from tiborvass/bk-fix-filters
bfc62bb1f9 Merge pull request #38145 from thaJeztah/bump_containerd_client_only_v1.2.0
596cdffb9f mount: add BindOptions.NonRecursive (API v1.40)
48620057be builder: fix bugs when pruning buildkit cache with filters
12bba16306 Merge pull request #38029 from lifubang/checkpointrm
dd7799afd4 update containerd client and dependencies to v1.2.0
e80ee5206e Bump Golang to 1.11.2
22d3946d6c Merge pull request #38117 from cpuguy83/volume_docstrings
b092ced7e6 Merge pull request #38122 from mjeromin/38070-go-command-detect
60ec93f7c2 Fix error handling when go command is missing
1124543ca8 seccomp: allow ptrace for 4.8+ kernels
35985ca087 Merge pull request #38133 from thaJeztah/cleanup_volume_tests
be17863fb1 Merge pull request #38136 from dnephin/remove-myself-from-codeowners
60db693e48 Remove myself from codeowners of client/**
3fccc47a09 Merge pull request #38127 from kolyshkin/int-fixes
e81d84971f Fix some doc strings in the volume package
b334198e65 Enable volume tests on Windows
05e18429cf Integration test: use filepath.Join() to make path cross-platform
8e8cac8263 Some improvements to TestVolumesInspect
2ed512c7fa integration-cli/Test*Swarm*: use same args on restart
06afc2d1e6 TestAPISwarmLeaderElection: add some debug
24cbb98971 docker_cli_swarm_test: factor out common code
6016520162 internal/test/daemon: don't leak timers
73baee2dcf integration-cli: fix netns test cleanup
66cb1222d6 docker_cli_swarm_test.go: rm unused arg
be2f7ce3ca Add an op func to override Client.scheme
46652b00ad Merge pull request #38120 from thaJeztah/bump_libnetwork
be3843c8c8 Bump SwarmKit to 8d8689d5a94ac42406883a4cef89b3a5eaec3d11
87558ad4dd update libnetwork to fix iptables compatibility on debian
104cbc0780 Merge pull request #38115 from thaJeztah/fix_double_scheme
1434204647 Fix double "unix://" scheme in TestInfoAPIWarnings
547f11d84c Merge pull request #38103 from tonistiigi/cluster-grpc-limits
99a7a4dcd0 checkpoint rm fail
aea6fdf3d3 Allow to override the Makefile's `DOCKER_MOUNT` variable
4822fb1e24 apparmor: allow receiving of signals from 'docker kill'
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
It depends on virtual/containerd which is provided by
containerd-opencontainers, so set the same COMPATIBLE_HOST as the last one.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
The only thing which docker uses /etc/docker for is a TLS key for
connecting with other TLS-enabled services. Make /etc/docker a symlink
to the existing docker volatiles directory so that we can use docker on
a read-only rootfs.
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Fix numerous docker.init issues such as missing runtime dependency
util-linux-unshare, incomplete handling of start/stop etc. operations
and minor typos.
Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Infrastructure changes triggered updated to supporting parts of the
docker stack, so to make sure that everything stays in sync we update
to the 18.09 release.
There were some minor build differences in this update, but in the
end, things are better since we can use some more of the Make infrastructure
versus calling 'go build' directly.
Also, docker-ce and docker are now virtually the same, except for the
moby based docker pulling in the cli and libnetwork repos independently.
There should be virtually no difference between the results, but we still
keep the two variants for flexibility.
We also drop the unused/legacy 'hi.Dockerfile'.
Tested with both kubernetes and docker unit tests.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
1. After security flag PIE is enabled by default, we might met
below QA warning on some arch, like aarch64, fix it by skip
textrel QA check refer commit b689c72a of oe-core
WARNING: docker-18.03.0+git708b068d3095c6a6be939eb2da78c921d2e945e2-r0
do_package_qa: QA Issue: ELF binary 'work/aarch64-poky-linux/docker/
18.03.0+git708b068d3095c6a6be939eb2da78c921d2e945e2-r0/packages-split/
docker/usr/bin/docker' has relocations in .text [textrel]
2. This problem is caused since security_flags.inc is used by default.
so alternative work around is:
SECURITY_CFLAGS_pn-docker = "${SECURITY_NOPIE_CFLAGS}"
SECURITY_LDFLAGS_pn-docker = ""
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
We use the systemd service file from within the docker git
repo. Removing the unused recipe space version, since it is
invalid and causes confusion.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This removes the warning that docker can't find docker-init
in PATH.
This recipe is based on the recipe from meta-resin.
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This requires libseccomp from meta-security so it is not enabled by default.
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Rather than invoking go directly to build docker-proxy, we can use
the libnetwork Make infrastructure. This picks up our exported go
enviroment variables, and other sysroot flags.
We also apply one patch to ensure that the cross-go toolchain is
used, and that the proper build flags are used.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit introduces a docker-ce reference recipe that is nearly
identical to the docker_git recipe.
The main difference between these two recipes is that one builds from
moby and this one from the docker-ce repository itself. The different
repositories mean that a different selection of commits are used and
that the build locations change slightly.
Although both docker_git and this recipe share nearly all their code,
they will vary more in the future, and prematurely factoring them
into a .inc file is not practical (until this proves useful).
Future work: remove the individual libnetwork and cli repository
fetches and build the components directly from the docker-ce repo.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Uprev the docker daemon, proxy and cli to 18.03.0.
The SRCREVs for these updates come from the versions logged in the
docker-ce 18.03.0 release. The docker-ce recipe has a pure docker-ce
single repository build, but here, we continue to assemble the individual
parts for maximum flexibility.
Along with the uprev, we add new dependencies required to build the new
version; libtool and pkcconfig (although unused by the recipe itself).
Finally we switch to a Makefile based build of the cli to allow the
commit and docker version to be properly captured in the docker executable.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Only include aufs-utils if the corresponding distro feature is enabled.
Without that the aufs kernel driver is not included too.
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
If the GOARCH isn't set CGO took the ARCH from the host and tries
to use -m64 flag that isn't available in aarch64 compiler.
...
| # github.com/opencontainers/runc/libcontainer/system
| aarch64-linaro-linux-gcc: error: unrecognized command line option
'-m64'
| # github.com/containerd/console
| aarch64-linaro-linux-gcc: error: unrecognized command line option
'-m64'
| Makefile:60: recipe for target 'shim-static' failed
...
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Recently in the oe-core the go.bbclass changed and requires the
defition of the GO_IMPORT variable. This was intended to simplify how
the compilation works with go packages and it is still a work in
progress.
This patch set makes the recipes compatible to generate the same end
result as before using the new go.bbclass from oe-core.
Any patches that were included in the recipes had to have the paths
adjusted because the new go.bbclass manipulates the notion of S to be
S + "src" + "$GO_IMPORT" internally for the purpose of unpack, patch
and compile.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Fix daemonization, align args with docker.service, fix line breaks in
log file - and fix INITSCRIPT_PARAMS (there is no variable
OS_DEFAULT_INITSCRIPT_PARAMS).
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
The docker uprev missed the version string which matches the actual
binary being built. With this change, the package now reflects the
correct version.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
The build method for docker client changed where by the docker cli is
now required to be pulled in from a separate git tree to be built.
The integration patch to cross compile was also upreved since some
parts of it were accepted upstream while other parts have not been
accepted at this time.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
According to https://github.com/docker/libtrust, this repo is now deprecated
and the library was integrated in the docker-distribution repository.
Signed-off-by: Anselmo L. S. Melo <anselmo.melo@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Continue work to use go infra in oe-core instead of the support for go
previously found in meta-virt. This is a 1:1 drop in replacement and
removes one more go piece from meta-virt in favor of the common
support found in oe-core.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
The docker recipe has some outdated go hacks. While this doesn't remove
them all, it does use more of the oe-core go infrastructure .. and that
results in more consistent builds.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
We can now use the oe-core go bbclass to get our DEPENDS correct
for building these go packages.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Follow the bouncing docker-registry package. Rather than use the docker hub
registry container, we can have finer grained control if we clone and build
the docker-distribution repository directly.
Since this is distinct from the main docker package/codebase, we break the
registry back out into its own package.
We also create a baseline configuration and .service file that can be the
basis for more complex implementations.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
The docker v1 registry has long been depreciated and moved into the
docker distribution library.
The registry is run via the docker CLI and not through a standalone
server.
This change removes the old registry and adds a .service file + package
for docker registry in the main docker recipe. Anyone that wants to
run a local registry can install the docker-registry package and the
service will start.
Note: No full config.yml file is provided, since the default are sane.
If tweaks are required, we can use ENV vars or consider adding a
config overlay.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Most (all) distros package docker-proxy along with the docker CLI
and daemon .. largely due to the fact that it is required to run
the docker registry.
docker-proxy is part of the libnetwork repository, so we add it to
the docker recipe as a separate git repo and integrate it into the
build and packaging process.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Since there are two implementations of runc and containerd that may
not always be in sync, the docker variant, and the opencontainers
variable, we create a virtual/* namespace for these components.
Anything requiring runc or containerd should set a preferred provider
to get the desired/tested variant.
We set the default provider to the docker variants, since they are
the primary use case for these components.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Oru existing docker.service file is using an out of date command. We
can use the contrib .service file instead .. and hopefully it will
stay up to date.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Regular users don't need lxc, docker-registry and rt-tests on the target.
These tools aren't even needed or provide additional features when running
docker at runtime. They also increase the size of the image uneccessarily.
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Docker is failing to build because it is attempting to download
missing go dependencies. Add new recipes for missing dependencies and
update existing recipes to ensure the version defined in docker's
vendor.conf is available.
Note that this fixes the build only. At this time many docker
functions are working, such as 'docker image', 'docker pull' and more,
but 'docker run' is currently failing.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Since we are building a cross tool which produces something which is
ARCH specific we should stick to the <toolname>-cross-<arch> naming
convention. A variant of this patch has been floating around for a
while but with the changes around per recipe sysroots, distributed
builds, shared builds... we are best served to adopt this convention
now.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Make use of bitbake variable where appropriate, this makes the recipe portable.
Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This new version of docker starts to assume that go 1.7 is
used. Specifically in go 1.7 golang.org/x/net/context has been merged
so the include is starting to be shortened to simply "context" which
does not work when using go 1.6. We can continue to use go 1.6 by
using the full pkg path.
Additionally the docker-proxy is not built when using the hacks build
mechanism, as we do to build docker (ie. we don't build docker in a
docker container). We could probably find a way to build docker-proxy
using the build hacks, but for now we will simply drop docker-proxy
from the package. In an embedded env. using the proxy doesn't make a
lot of sense anyways.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Adjust SRCREV and DOCKER_VERSION to match docker 1.13.0 release.
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
cosmetic only, no changes in behavior:
* align all the DEPENDS, better readability
* fix indentation in do_install(): space -> tab
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
It allows to:
* easily extend future architecture added/supported
* tune arm architecture and set GOARM as appropriate
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
The script /usr/share/docker/config-check.sh is very useful to test all
kernel requirements for docker. A lot of embedded boards will use a
custom kernel config that does not have all kernel features enabled by
default. Install the script so kernel developer can easily enable the
missing features.
Signed-off-by: Stefan Lengfeld <s.lengfeld@phytec.de>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Seems upstream adjusted their LICENSE file. The license is still
Apache version 2 so no worries about having to update the LICENSE
string for the recipe.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Systemd takes care of setting up the various cgroup mounts at boot,
and likewise the tearing down of these at shutdown. It is therefor a
useless dependency when we are using systemd.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Bumping the version of docker and dependencies. This gets us closer to
runc 1.0, which is the foundation for future OCI efforts.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
The docker build isn't properly using CFLAGS/LDFLAGS, which triggers the following
QA error:
ERROR: docker-1.11.1+git5604cbed50d51c4039b1abcb1cf87c4e01bce924-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary: 'docker/1.11.1+git5604cbed50d51c4039b1abcb1cf87c4e01bce924-r0/packages-split/docker/usr/bin/docker' [ldflags]
ERROR: docker-1.11.1+git5604cbed50d51c4039b1abcb1cf87c4e01bce924-r0 do_package_qa: QA run found fatal errors. Please consider fixing them
ERROR: docker-1.11.1+git5604cbed50d51c4039b1abcb1cf87c4e01bce924-r0 do_package_qa: Function failed: do_package_qa
ERROR: Logfile of failure stored in: tmp/work/core2-64-overc-linux/docker/1.11.1+git5604cbed50d51c4039b1abcb1cf87c4e01bce924-r0/temp/log.do_package_qa.63906
ERROR: Task meta-virtualization/recipes-containers/docker/docker_git.bb:do_package_qa (meta-virtualization/recipes-containers/docker/docker_git.bb:do_package_qa) failed with exit code '1'
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Usually $GOROOT is set by go tool, but if sstate is specified, $GOROOT
is set to the path in the first project. If docker is built in the
another project(with same SSTATE_DIR) later, and the first project is removed,
the following error will be seen:
| go: cannot find GOROOT directory:
/path/to/previous/project/bitbake_build/tmp/sysroots/x86_64-linux/usr/lib/x86_64-wrs-linux/go
This commit is overriding $GOROOT stored in the go tool in sstate cache,
making sure it is set to the correct path in current project.
See more information here: https://golang.org/doc/install#install
Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
We no longer need go-net and go-sqlite for the docker build and
runtime. The upstream repos are no longer properly fetching, so
we can simply drop the recipes and dependency.
If they are ever needed in the future, we can revisit the upstream
source for them.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
The 'base_contains' is now deprecated and only kept as a compatibility method. It will be removed in future releases.
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
