diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-11-26 20:12:24 +0100 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-11-27 07:41:28 +0000 |
| commit | f9f26b1d0a30cb12bd94a4accd1b5271ef046628 (patch) | |
| tree | ff188ec63569d221f092db1af47e39ef4528dc2f /docker-vyos/Dockerfile | |
| parent | 46236f50a450632ea731897c3bd3326264ca8066 (diff) | |
| download | vyos-build-f9f26b1d0a30cb12bd94a4accd1b5271ef046628.tar.gz vyos-build-f9f26b1d0a30cb12bd94a4accd1b5271ef046628.zip | |
T2640: update VyOS in docker image to current version
(cherry picked from commit 0411ec870eb25931efb3e42e68d5212fbb9e9844)
Diffstat (limited to 'docker-vyos/Dockerfile')
| -rw-r--r-- | docker-vyos/Dockerfile | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/docker-vyos/Dockerfile b/docker-vyos/Dockerfile index 16dbb1aa..ef7621c6 100644 --- a/docker-vyos/Dockerfile +++ b/docker-vyos/Dockerfile @@ -20,25 +20,45 @@ ARG BUILD_DATE # Use Debian as base layer FROM debian:bookworm-slim + +LABEL authors="VyOS Maintainers <maintainers@vyos.io>" +ENV DEBIAN_FRONTEND noninteractive + +RUN /bin/echo -e 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";' > /etc/apt/apt.conf.d/01norecommends + +# Base packaged needed to build packages and their package dependencies +RUN apt-get update && apt-get install -y \ + ca-certificates \ + gnupg \ + curl \ + fuse-overlayfs \ + jq \ + yq + # Copy installer script and default build settings -COPY [ "data/defaults.json", "data/live-build-config/archives/*", "docker-vyos/vyos_install_common.sh", "docker-vyos/vyos_install_stage_01.sh", "/tmp/" ] +COPY [ "data/defaults.toml", \ + "data/architectures/amd64.toml", \ + "data/live-build-config/archives/*", \ + "docker-vyos/vyos_install_common.sh", \ + "docker-vyos/vyos_install_stage_01.sh", \ + "/tmp/"] COPY [ "data/live-build-config/hooks/live/*", "/tmp/hooks/" ] - # Install VyOS dependencies WORKDIR /tmp RUN bash /tmp/vyos_install_stage_01.sh # Install VyOS specific software -COPY [ "data/defaults.json", "docker-vyos/vyos_install_common.sh", "docker-vyos/vyos_install_stage_02.sh", "/tmp/" ] +COPY [ "data/defaults.toml", \ + "data/architectures/amd64.toml", \ + "docker-vyos/vyos_install_common.sh", \ + "docker-vyos/vyos_install_stage_02.sh", "/tmp/" ] RUN bash /tmp/vyos_install_stage_02.sh # Tune system for VyOS COPY [ "docker-vyos/vyos_install_common.sh", "docker-vyos/vyos_install_stage_03.sh", "/tmp/" ] -# Copy skel for bash profile -COPY data/live-build-config/includes.chroot/etc/skel/.bashrc /etc/skel/.bashrc # Copy default config COPY data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default /opt/vyatta/etc/ |