summaryrefslogtreecommitdiff
path: root/docker-vyos/Dockerfile
diff options
context:
space:
mode:
authorLeonardo Amaral <contato@leonardoamaral.com.br>2024-06-11 18:03:33 -0300
committerLeonardo Amaral <contato@leonardoamaral.com.br>2024-06-11 18:03:33 -0300
commit946a6088923016631e870943e9b904fe821d48d6 (patch)
treef39b4480dd1db26e03a701f23ede0fbdd81abaa6 /docker-vyos/Dockerfile
parent26181773ef684701c0154b99ebea307e672d5f17 (diff)
downloadvyos-build-946a6088923016631e870943e9b904fe821d48d6.tar.gz
vyos-build-946a6088923016631e870943e9b904fe821d48d6.zip
docker: arm: T6474: Initial support for dynamic arch toml loading.
Signed-off-by: Leonardo Amaral <contato@leonardoamaral.com.br>
Diffstat (limited to 'docker-vyos/Dockerfile')
-rw-r--r--docker-vyos/Dockerfile8
1 files changed, 5 insertions, 3 deletions
diff --git a/docker-vyos/Dockerfile b/docker-vyos/Dockerfile
index 95fe6ee3..0233817b 100644
--- a/docker-vyos/Dockerfile
+++ b/docker-vyos/Dockerfile
@@ -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