ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-05-01 00:10:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

docker: Improve handling of Docker-in-Docker errors

Browse Source 
The `local` logging driver captures output from container’s stdout/stderr
and writes them to an internal storage that is optimized for performance and disk use.

We also want to capture these logs on startup to wait for success/failure.

Advise the use of `--privileged` when running Docker-in-Docker to avoid
various permissions issues encountered in testing.

Change-type: patch
Changlelog-entry: docker: Improve handling of Docker-in-Docker errors
Signed-off-by: Kyle Harding <kyle@balena.io>
This commit is contained in:
Kyle Harding 2021-03-25 14:02:22 +00:00
parent 3ac1994941
commit 9036ce9af3
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/DOCKER.md
View File

@ -68,7 +68,7 @@ These environment variables are available for additional functionality included
In most cases these are optional, but some examples will highlight when environment variables are required. In most cases these are optional, but some examples will highlight when environment variables are required.
- `-e "SSH_PRIVATE_KEY=$(</path/to/priv/key)"`: copy your private SSH key file contents as an environment variable - `-e "SSH_PRIVATE_KEY=$(</path/to/priv/key)"`: copy your private SSH key file contents as an environment variable
- `-e "DOCKERD=1"`: enable the included Docker-in-Docker daemon (requires `--cap-add SYS_ADMIN`) - `-e "DOCKERD=1"`: enable the included Docker-in-Docker daemon (requires `--privileged`)
## Keeping the CLI image up to date ## Keeping the CLI image up to date
@ -269,8 +269,6 @@ $ docker run --rm -it -v "balena_data:/root/.balena" \
> exit > exit
``` ```
### preload ### preload
- <https://www.balena.io/docs/reference/balena-cli/#os-download-type> - <https://www.balena.io/docs/reference/balena-cli/#os-download-type>
@ -284,7 +282,7 @@ The easiest way to run this command is to use the included Docker-in-Docker daem
```bash ```bash
$ docker run --rm -it -v "balena_data:/root/.balena" \ $ docker run --rm -it -v "balena_data:/root/.balena" \
-v "docker_data:/var/lib/docker" \ -v "docker_data:/var/lib/docker" \
-e "DOCKERD=1" --cap-add SYS_ADMIN \ -e "DOCKERD=1" --privileged \
balenalib/amd64-debian-balenacli /bin/bash balenalib/amd64-debian-balenacli /bin/bash
> balena os download raspberrypi3 -o raspberry-pi.img > balena os download raspberrypi3 -o raspberry-pi.img
@ -331,7 +329,7 @@ This bind mount is required so the CLI has access to your app sources.
```bash ```bash
$ docker run --rm -it -v "balena_data:/root/.balena" \ $ docker run --rm -it -v "balena_data:/root/.balena" \
-v "docker_data:/var/lib/docker" \ -v "docker_data:/var/lib/docker" \
-e DOCKERD=1 --cap-add SYS_ADMIN \ -e DOCKERD=1 --privileged \
-v "$PWD:$PWD" -w "$PWD" \ -v "$PWD:$PWD" -w "$PWD" \
balenalib/amd64-debian-balenacli /bin/bash balenalib/amd64-debian-balenacli /bin/bash

3
docker/alpine/Dockerfile
View File

@ -41,3 +41,6 @@ ENTRYPOINT [ "/usr/src/app/init.sh" ]
CMD [ "help" ] CMD [ "help" ]
ENV SSH_AUTH_SOCK "/ssh-agent" ENV SSH_AUTH_SOCK "/ssh-agent"
# docker data must be a volume or tmpfs
VOLUME /var/lib/docker

3
docker/debian/Dockerfile
View File

@ -41,3 +41,6 @@ ENTRYPOINT [ "/usr/src/app/init.sh" ]
CMD [ "help" ] CMD [ "help" ]
ENV SSH_AUTH_SOCK "/ssh-agent" ENV SSH_AUTH_SOCK "/ssh-agent"
# docker data must be a volume or tmpfs
VOLUME /var/lib/docker

7
docker/docker-init.sh
View File

@ -4,7 +4,12 @@
if [ "${DOCKERD}" = "1" ] if [ "${DOCKERD}" = "1" ]
then then
[ -e /var/run/docker.sock ] && rm /var/run/docker.sock [ -e /var/run/docker.sock ] && rm /var/run/docker.sock
dockerd & dockerd --log-driver=local 2>&1 | tee /tmp/dockerd.log &
while ! grep -q 'API listen on' /tmp/dockerd.log
do
grep -q 'Error starting daemon' /tmp/dockerd.log && exit 1
sleep 1
done
fi fi
# load private ssh key if one is provided # load private ssh key if one is provided