Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing POdman builds #588

Merged
merged 2 commits into from
Jan 11, 2024
Merged

Fixing POdman builds #588

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ef649c
Update Dockerfile
boostchicken Jan 11, 2024
949d2fb
Update Dockerfile
boostchicken Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions podman-update/build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand All @@ -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 \
Expand All @@ -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

Expand Down
Loading