summaryrefslogtreecommitdiff
path: root/docker-vyos/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'docker-vyos/Dockerfile')
-rw-r--r--docker-vyos/Dockerfile35
1 files changed, 27 insertions, 8 deletions
diff --git a/docker-vyos/Dockerfile b/docker-vyos/Dockerfile
index cfe505ef..ef7621c6 100644
--- a/docker-vyos/Dockerfile
+++ b/docker-vyos/Dockerfile
@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1
-# Copyright (C) 2020 VyOS maintainers and contributors
+# Copyright (C) 2020-2023 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
@@ -17,29 +17,48 @@
# Define arguments for VyOS image
ARG VYOS_VERSION
ARG BUILD_DATE
-ARG DEBIAN_VERSION
# Use Debian as base layer
-FROM debian:${DEBIAN_VERSION}-slim
+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/