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

YANET build images is ready to Ubuntu 24.04 #268

Merged
merged 1 commit into from
Jan 23, 2025
Merged

YANET build images is ready to Ubuntu 24.04 #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions build/Dockerfile.debian-package
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ARG RELEASE=22.04
FROM --platform=linux/amd64 ubuntu:${RELEASE}
ARG BUILD_PLATFORM=linux/amd64
ARG RELEASE=24.04
FROM --platform=${BUILD_PLATFORM} ubuntu:${RELEASE} AS environment

ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update
RUN apt-get install -y --no-install-recommends \
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
build-essential \
ninja-build \
pkg-config \
Expand All @@ -27,7 +27,9 @@ RUN apt-get install -y --no-install-recommends \
bison \
debhelper-compat

RUN python3 -m pip install meson==0.61.2
# PEP 668 strict recommends to use virtualenv
RUN python3 -m pip install meson==0.61.2 --break-system-packages \
|| python3 -m pip install meson==0.61.2

COPY . /opt/yanet
WORKDIR /opt/yanet
Expand Down
11 changes: 7 additions & 4 deletions build/Dockerfile.image
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ARG RELEASE=22.04
FROM --platform=linux/amd64 ubuntu:${RELEASE} AS environment
ARG BUILD_PLATFORM=linux/amd64
ARG RELEASE=24.04
FROM --platform=${BUILD_PLATFORM} ubuntu:${RELEASE} AS environment

RUN apt-get update
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
Expand All @@ -26,7 +27,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
bison \
debhelper-compat

RUN python3 -m pip install meson==0.61.2
# PEP 668 strict recommends to use virtualenv
RUN python3 -m pip install meson==0.61.2 --break-system-packages \
|| python3 -m pip install meson==0.61.2


FROM environment AS builder
Expand All @@ -52,7 +55,7 @@ RUN meson setup --prefix=/target \
RUN meson compile -C build


FROM --platform=linux/amd64 ubuntu:${RELEASE}
FROM --platform=${BUILD_PLATFORM} ubuntu:${RELEASE}

RUN apt-get update
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
Expand Down
Loading