ipng/vpp-containerlab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ipng:49b8df970942537b05d6d20a9ec5d28b861a412c
Branches Tags
ipng:main
...
compare: ipng:17c397787395e22c4e3504c4e99cf4c0f6d16d2f
Branches Tags
ipng:main

2 Commits
49b8df9709 ... 17c3977873

Author SHA1 Message Date
Pim van Pelt
17c3977873 Move to Ubuntu Noble, which allows for arm64 images 2025-05-08 18:32:25 +02:00
Pim van Pelt
e5889b22e2 Reduce docker layers, rename the Dockerfile in prep for move to Ubuntu 2025-05-08 18:29:59 +02:00
2 changed files with 12 additions and 14 deletions
Expand all files Collapse all files

4
README.md
View File

@ -94,7 +94,7 @@ bind-mount `/etc/vpp/bootstrap.vpp`.
```bash
IMG=git.ipng.ch/ipng/vpp-containerlab
TAG=latest
docker build --no-cache --build-arg REPO=release -f docker/Dockerfile.bookworm -t $IMG docker/
docker build --no-cache --build-arg REPO=release -f docker/Dockerfile -t $IMG docker/
docker image tag $IMG $IMG:$TAG
docker push $IMG
docker push $IMG:$TAG
@ -110,7 +110,7 @@ docker run --cap-add=NET_ADMIN --cap-add=SYS_NICE --cap-add=SYS_PTRACE \
--device=/dev/net/tun:/dev/net/tun \
--device=/dev/vhost-net:/dev/vhost-net \
--privileged --name clab-pim \
docker.io/pimvanpelt/vpp-containerlab:latest
git.ipng.ch/ipng/vpp-containerlab:latest
docker network connect clab-network clab-pim
```

22
docker/Dockerfile.bookworm → docker/Dockerfile
View File

@ -1,4 +1,4 @@
FROM debian:bookworm
FROM ubuntu:noble
ARG DEBIAN_FRONTEND=noninteractive
ARG VPP_INSTALL_SKIP_SYSCTL=true
ARG REPO=release
@ -8,25 +8,23 @@ RUN apt-get update && apt-get -y install curl procps tcpdump iproute2 iptables \
mtr-tiny traceroute && apt-get clean
# Install VPP
RUN mkdir -p /var/log/vpp /root/.ssh/
RUN curl -s https://packagecloud.io/install/repositories/fdio/${REPO}/script.deb.sh | bash
RUN apt-get update && apt-get -y install vpp vpp-plugin-core && apt-get clean
RUN mkdir -p /var/log/vpp /root/.ssh/ && \
curl -s https://packagecloud.io/install/repositories/fdio/${REPO}/script.deb.sh | bash && \
apt-get -y install vpp vpp-plugin-core && apt-get clean
# Build vppcfg
RUN pip install --break-system-packages build netaddr yamale argparse pyyaml ipaddress
RUN git clone https://git.ipng.ch/ipng/vppcfg.git && cd vppcfg && python3 -m build && \
RUN pip install --break-system-packages build netaddr yamale argparse pyyaml ipaddress && \
git clone https://git.ipng.ch/ipng/vppcfg.git && cd vppcfg && python3 -m build && \
pip install --break-system-packages dist/vppcfg-*-py3-none-any.whl
# Install FRR
RUN curl -s -o /usr/share/keyrings/frrouting.gpg https://deb.frrouting.org/frr/keys.gpg && \
echo deb '[signed-by=/usr/share/keyrings/frrouting.gpg]' https://deb.frrouting.org/frr bookworm frr-stable \
> /etc/apt/sources.list.d/frr.list && \
apt -y update && apt -y install frr frr-pythontools && apt clean
echo deb '[signed-by=/usr/share/keyrings/frrouting.gpg]' https://deb.frrouting.org/frr bookworm frr-stable \
> /etc/apt/sources.list.d/frr.list && \
apt -y update && apt -y install frr frr-pythontools && apt clean
# Config files
COPY files/etc/vpp/* /etc/vpp/
COPY files/etc/bird/* /etc/bird/
COPY files/etc/frr/* /etc/frr/
COPY files/etc/ /etc/
COPY files/init-container.sh /sbin/
RUN chmod 755 /sbin/init-container.sh
CMD ["/sbin/init-container.sh"]