contrib: dockerfile: Update to bookworm and drop libvirt compatibility #437
Conversation
contrib/dockerfile/Makefile
Outdated
| -e http_proxy=$(http_proxy) \ | ||
| -e https_proxy=$(https_proxy) \ | ||
| -e no_proxy=$(no_proxy) \ | ||
| -v $(shell git rev-parse --show-toplevel):/usr/elbe -w /usr/elbe\ |
contrib/dockerfile/Makefile
Outdated
| --security-opt apparmor:unconfined \ | ||
| --group-add kvm \ | ||
| --device /dev/kvm \ | ||
| --device /dev/fuse \ |
There was a problem hiding this comment.
This is copied from below, correct? Should be possible to remove.
| --rm \ | ||
| --interactive \ | ||
| --tty \ | ||
| $(IMAGENAME) |
There was a problem hiding this comment.
It would be nice to deduplicate the two commands
contrib/dockerfile/Makefile
Outdated
| start-devel: | ||
| docker ps | grep $(CONTAINERNAME)$$ || \ | ||
| docker run --name $(CONTAINERNAME) \ | ||
| -e container=docker \ |
There was a problem hiding this comment.
Do you mean that the start-devel option is unnecessary ? Or is it something else in those 4 lines ?
There was a problem hiding this comment.
- e container=docker is unnecessary. At least it's not used by ELBE.
contrib/dockerfile/Makefile
Outdated
| --device /dev/kvm \ | ||
| --device /dev/fuse \ | ||
| --rm \ | ||
| --interactive \ |
There was a problem hiding this comment.
A noninteractive container is quite useful, can it be kept?
There was a problem hiding this comment.
I'm not a Docker expert, but after doing some research, I don't believe using a non-interactive Docker container is beneficial in this particular situation (and I wasn't able to make it work :( ).
In this case, the container is started with a shell process, unlike the previous container which ran systemd and required attaching a shell afterward.
There was a problem hiding this comment.
It would be useful to have it running in the background to run programs in it with docker exec. The entrypoint would just sleep forever.
But we can leave it for now and I'll try to extend it later.
contrib/dockerfile/Dockerfile.in
Outdated
| RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list; \ | ||
| echo "deb http://deb.debian.org/debian-security bullseye-security main" >> /etc/apt/sources.list | ||
| RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/sources.list; \ | ||
| echo "deb http://deb.debian.org/debian-security bookworm-security main" >> /etc/apt/sources.list |
There was a problem hiding this comment.
These sources can probably be dropped completely.
The packages in bookworm are fine without backports.
The security repository is already preconfigured, leading to (red) warnings:
W: Target Packages (main/binary-amd64/Packages) is configured multiple times in /etc/apt/sources.list:2 and /etc/apt/sources.list.d/debian.sources:2
W: Target Packages (main/binary-all/Packages) is configured multiple times in /etc/apt/sources.list:2 and /etc/apt/sources.list.d/debian.sources:2
contrib/dockerfile/Makefile
Outdated
| -e http_proxy=$(http_proxy) \ | ||
| -e https_proxy=$(https_proxy) \ | ||
| -e no_proxy=$(no_proxy) \ | ||
| -v $(shell git rev-parse --show-toplevel):/usr/elbe -w /usr/elbe\ |
There was a problem hiding this comment.
Using /usr for this breaks the is_devel logic from elbepack/version.py
There was a problem hiding this comment.
It was the whole point, when running the container with start-devel, you force the container to use the elbe repository you're modifying and not the packaged one.
There was a problem hiding this comment.
Yes, that I get. But putting it at /usr/ might confuse ELBE.
Can you put it at /var/cache/elbe/devel instead? This it consistent with the initvm devel mode.
The current container is running debian bullseye and is starting systemd to run libvirtd in background. This container is broken since some times. This commit updates the dockerfile to run interactively, libvirt isn't supported in this version. There are two launch options, start to run in production which will use the packaged version of Elbe and start-devel which will use the version of Elbe currently being used by the repository. Signed-off-by: Thomas Bonnefille <[email protected]>
2 participants
The current container is running debian bullseye and is starting systemd to run libvirtd in background. This container is broken since some times.
This commit updates the dockerfile to run interactively, libvirt isn't supported in this version.
There are two launch options, start to run in production which will use the packaged version of Elbe and start-devel which will use the version of Elbe currently being used by the repository.