docker: arm: T6474: Initial support for dynamic arch toml loading.

Signed-off-by: Leonardo Amaral <contato@leonardoamaral.com.br>
This commit is contained in:
Leonardo Amaral 2024-06-11 18:03:33 -03:00
parent 26181773ef
commit 946a608892
No known key found for this signature in database
3 changed files with 46 additions and 4 deletions

View File

@ -37,30 +37,32 @@ RUN apt-get update && apt-get install -y \
# Copy installer script and default build settings
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/architectures/*", "/tmp/architectures_triage/" ]
COPY [ "data/live-build-config/hooks/live/*", "/tmp/hooks/" ]
# Install VyOS dependencies
WORKDIR /tmp
RUN bash -c 'mv /tmp/architectures_triage/$(dpkg --print-architecture).toml /tmp && rm -rf /tmp/architectures_triage'
RUN bash /tmp/vyos_install_stage_01.sh
# Install VyOS specific software
COPY [ "data/defaults.toml", \
"data/architectures/amd64.toml", \
"docker-vyos/vyos_install_common.sh", \
"docker-vyos/vyos_install_stage_02.sh", "/tmp/" ]
COPY [ "data/architectures/*", "/tmp/architectures_triage/" ]
RUN bash -c 'mv /tmp/architectures_triage/$(dpkg --print-architecture).toml /tmp && rm -rf /tmp/architectures_triage'
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 default config
COPY data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default /opt/vyatta/etc/
COPY tools/container/config.boot.default /opt/vyatta/etc/
RUN bash /tmp/vyos_install_stage_03.sh

View File

@ -25,7 +25,7 @@ function prepare_apt() {
# Add VyOS repository to the system
local APT_VYOS_MIRROR=$(tomlq --raw-output .vyos_mirror /tmp/defaults.toml)
local APT_VYOS_BRANCH=$(tomlq --raw-output .vyos_branch /tmp/defaults.toml)
local APT_ADDITIONAL_REPOS=$(tomlq --raw-output .additional_repositories[] /tmp/amd64.toml)
local APT_ADDITIONAL_REPOS=$(tomlq --raw-output .additional_repositories[] /tmp/$(dpkg --print-architecture).toml)
local RELEASE_TRAIN=$(tomlq --raw-output .release_train /tmp/defaults.toml)
echo "APT_VYOS_MIRROR : $APT_VYOS_MIRROR"

View File

@ -0,0 +1,40 @@
system {
host-name vyos
login {
user vyos {
authentication {
encrypted-password "*"
plaintext-password ""
}
level admin
}
}
syslog {
global {
facility all {
level info
}
facility protocols {
level debug
}
}
}
ntp {
server "time1.vyos.net"
server "time2.vyos.net"
server "time3.vyos.net"
}
console {
device ttyS0 {
speed 115200
}
}
config-management {
commit-revisions 100
}
}
interfaces {
loopback lo {
}
}