summaryrefslogtreecommitdiffstats
path: root/recipes-containers/docker/docker.inc
Commit message (Collapse)AuthorAgeFilesLines
* docker: Fix for sysvinitLeon Anavi2021-07-201-1/+2
| | | | | | | | | Fix for rare legacy systems which still use simultaneously both sysvinit and systemd in DISTRO_FEATURES. This fix avoids issues during do_rootfs with postinstall scriptlets of ['docker-ce']. Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker: introduce -clie packageBruce Ashfield2021-04-291-0/+18
| | | | | | | | | | | | | | By the docker-packaging repository and https://docs.docker.com/engine/install/centos/#installation-methods docker is packaged by most distros with a split between the engine and the CLI. We do the same here, by introducing the -cli package But to keep existing use cases working, we also create a RDEPENDS between the main docker package (the engine) and the cli, so existing "docker" package installs will continue to work the same way. To have separate and non-redepending packages created set the DOCKER_UNIFIED_PACKAGE variable to False Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker: unify common parts of docker-ce and docker-moby recipesBruce Ashfield2021-04-291-0/+95
| | | | | | | | | | | | | | | | | Now that docker-ce is being built from the same repos as docker-moby, the only unique things in the recipes are the SRCREVs. We move the common packaging, compile/install routines and configuration to the .inc files. We also move the patches to the generic 'files' directory, so they can be shared. If we there are SRCREV bumps in the future that diverge moby and docker, we'll hold patches in their named directorys and tweak the compile/install routines as necessary. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker: add more kernel-module RRECOMMENDSBruce Ashfield2020-10-081-1/+1
| | | | | | | The kernel RRECOMMENDS, wasn't complete and in some minimal systems we are missing modules to start dockerd. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker: enable docker.socket instead of docker.serviceDan Callaghan2020-06-051-1/+1
| | | | | | | | | The docker daemon supports systemd socket activation. If we enable docker.socket (and not docker.service) then the daemon will be started when it is first used. Signed-off-by: Dan Callaghan <dan.callaghan@opengear.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker.inc: Add xt-addrtype kernel moduleNorbert Kaminski2019-12-011-1/+1
| | | | | | | | | | | | | | | | | | | Trying to use docker info and hello world container without this module causes a daemon error. docker info error log: Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running? dockerd error log: PREROUTING chain: iptables failed: iptables --wait -t nat -A PREROUTING -m addrtype --dst-type LOCAL -j DOCKER: iptables v1.8.3 (legacy): Couldn't load match `addrtype':No such file or directory Signed-off-by: Norbert Kaminski <norbert.kaminski@3mdeb.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker: add transient configuration packageconfigMatt Spencer2019-09-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit: [ Author: Tom Rini <trini@konsulko.com> Date: Fri Feb 8 13:22:35 2019 -0500 docker: Move /etc/docker to a symlink to volatiles 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> ] We've had a transient / volatile docker configuration since we point our /etc configuration to /run. This is not always a good thing if a static configuration for keys, etc, is desired. We maintain this functionality under the 'transient-config' PACKAGECONFIG, and also allow the existing static/permanent config to be used. Signed-off-by: Matt Spencer <matthew@thespencers.me.uk> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker: rename docker -> docker-moby and introduce virtual/dockerBruce Ashfield2019-09-241-0/+9
| | | | | | | | | | | | | | | | | | The recipe which was providing the default "docker" package was aligned with the moby repositories. In order to make that alignment clear, we rename that recipe docker-moby. To allow easier switching between the docker providing recipes, we introduce a virtual/docker PROVIDES to the common .inc file (and hence each recipe). This allows users to chose what they want via the standard PREFERRED_PROVIDER mechanism. Also to allow existing package lists and image installs to continue to work without changes, we make sure that the implementation specific docker-<foo> packages RPROVIDE docker. If any packages are missed, we'll add them to this list in future updates. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* containers/go/build: don't override global package strip flagsBruce Ashfield2019-07-221-2/+0
| | | | | | | | | | | | | | | | | | When the go-lang container recipes were first created there were issues with strip and the resulting binaries. As such, strip was inhibited for the various packages. This variable is now set in the default classes, and tests show that strip works on the binaries (saving up to 2M on disk for some binaries) with no runtime issues found. So we drop our explicit set of the inhibit and let the build proceed by the defaults. If issues are found, we can re-enable the setting or bbappends can turn it back on for builds showing issues. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker: make docker-init a runtime dependency by defaultStefan Agner2019-07-031-1/+2
| | | | | | | | | | | | | | | If docker run --init is used docker expects docker-init to be present, if not Docker fails to start the container with the following error: docker: Error response from daemon: exec: "docker-init": executable file not found in $PATH. However, docker-init does not get deployed by default since commit d19fda374317 ("docker: consolidate common depends/options"). Readd docker-init through a PACKAGECONFIG RDEPENDS to make sure it gets deployed by default again. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker: consolidate common depends/optionsBruce Ashfield2019-03-211-0/+56
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>