Merge pull request #46 from Nordix/main

VPP 24.10 uplift

Author: szvincze

Dockerfile

@@ -1,8 +1,8 @@
-ARG VPP_VERSION=1765f014bc7fcc3b924019ec96350eb50bef629f
-ARG UBUNTU_VERSION=20.04
-ARG GOVPP_VERSION=v0.8.0
+ARG VPP_VERSION=v24.10
+ARG UBUNTU_VERSION=24.04
+ARG GOVPP_VERSION=v0.11.0
 
-FROM ubuntu:${UBUNTU_VERSION} as vppbuild
+FROM ubuntu:${UBUNTU_VERSION} AS vppbuild
 ARG VPP_VERSION
 RUN apt-get update
 RUN DEBIAN_FRONTEND=noninteractive TZ=US/Central apt-get install -y git make python3 sudo asciidoc
@@ -15,33 +15,33 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=US/Central UNATTENDED=y make install-dep
 RUN make pkg-deb
 RUN ./src/scripts/version > /vpp/VPP_VERSION
 
-FROM vppbuild as version
+FROM vppbuild AS version
 CMD cat /vpp/VPP_VERSION
 
-FROM ubuntu:${UBUNTU_VERSION} as vppinstall
+FROM ubuntu:${UBUNTU_VERSION} AS vppinstall
 COPY --from=vppbuild /var/lib/apt/lists/* /var/lib/apt/lists/
 COPY --from=vppbuild [ "/vpp/build-root/libvppinfra_*_amd64.deb", "/vpp/build-root/vpp_*_amd64.deb", "/vpp/build-root/vpp-plugin-core_*_amd64.deb", "/vpp/build-root/vpp-plugin-dpdk_*_amd64.deb", "/pkg/"]
 RUN VPP_INSTALL_SKIP_SYSCTL=false apt install -f -y --no-install-recommends /pkg/*.deb ca-certificates iputils-ping iproute2 tcpdump iptables; \
     rm -rf /var/lib/apt/lists/*; \
     rm -rf /pkg
 
-FROM ubuntu:${UBUNTU_VERSION} as vpp
+FROM ubuntu:${UBUNTU_VERSION} AS vpp
 COPY --from=vppinstall / /
 
-FROM vpp as vpp-dbg
+FROM vpp AS vpp-dbg
 WORKDIR /pkg/
 COPY --from=vppbuild ["/vpp/build-root/libvppinfra-dev_*_amd64.deb", "/vpp/build-root/vpp-dbg_*_amd64.deb", "/vpp/build-root/vpp-dev_*_amd64.deb", "./" ]
 RUN VPP_INSTALL_SKIP_SYSCTL=false apt install -f -y --no-install-recommends ./*.deb
 
 
-FROM golang:1.20.5-alpine3.18 as binapi-generator
+FROM golang:1.20.5-alpine3.18 AS binapi-generator
 ENV GO111MODULE=on
 ENV CGO_ENABLED=0
 ENV GOBIN=/bin
 ARG GOVPP_VERSION
 RUN go install go.fd.io/govpp/cmd/binapi-generator@${GOVPP_VERSION}
 
-FROM alpine:3.18 as gen
+FROM alpine:3.18 AS gen
 COPY --from=vpp /usr/share/vpp/api/ /usr/share/vpp/api/
 COPY --from=binapi-generator /bin/binapi-generator /bin/binapi-generator
 COPY --from=vppbuild /vpp/VPP_VERSION /VPP_VERSION