Fixing POdman builds (#588)

* Update Dockerfile * Update Dockerfile
unifi-utilities · Jan 11, 2024 · 174b893 · 174b893
1 parent 4a51ef4
commit 174b893
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/podman-update/build/Dockerfile b/podman-update/build/Dockerfile
@@ -2,7 +2,7 @@
 FROM rust as rust
 RUN mkdir -p /tmp/work
 WORKDIR /tmp/work
-ARG NETAVARK_VERSION=v1.6.0
+ARG NETAVARK_VERSION=v1.9.0
 RUN apt-get update && apt-get install -y \
     bc \
     binutils-aarch64-linux-gnu \
@@ -19,10 +19,9 @@ RUN git clone https://github.com/containers/netavark/ && mkdir -p  /tmp/work/net
 WORKDIR /tmp/work/netavark
 COPY config.toml ./.cargo/config.toml
 COPY ./net.Makefile.patch /tmp
-RUN git checkout ${NETAVARK_VERSION} && rustup target add aarch64-unknown-linux-gnu && patch Makefile /tmp/net.Makefile.patch
-RUN make build
+RUN git checkout ${NETAVARK_VERSION} && rustup target add aarch64-unknown-linux-gnu && patch Makefile /tmp/net.Makefile.patch && make build
 
-FROM golang:1.18.3-stretch
+FROM golang:1.21.6-bookworm
 
 # Currenrtly supported versions: UDM-Base UDM-Pro-SE
 ARG UDM_PLATFORM=UDM-Base
@@ -41,7 +40,11 @@ RUN mkdir -p /tmp/install/podman-${PODMAN_VERSION}-${UDM_PLATFORM}/usr/bin \
 
 COPY --from=rust /tmp/work/netavark/bin/* /tmp/install/podman-${PODMAN_VERSION}-${UDM_PLATFORM}/usr/libexec/podman
 # Install dependencies
-RUN apt-get update && apt-get install -y \
+RUN dpkg --add-architecture arm64 && apt-get update && apt-get install -y \
+    gperf:arm64 \
+    libglib2.0-dev:arm64 \
+    libseccomp-dev:arm64 \
+    libsystemd-dev:arm64 \
     bc \
     binutils-aarch64-linux-gnu \
     bison \
@@ -57,13 +60,7 @@ RUN apt-get update && apt-get install -y \
     systemd \
     zip \
   && rm -rf /var/lib/apt/lists/*
-RUN dpkg --add-architecture arm64
-RUN apt-get update && apt-get install -y \
-    gperf:arm64 \
-    libglib2.0-dev:arm64 \
-    libseccomp-dev:arm64 \
-    libsystemd-dev:arm64 \
-  && rm -rf /var/lib/apt/lists/*
+
 
 ENV GOOS=linux