darlinghq/darling
1
0
Fork 0
mirror of https://github.com/darlinghq/darling.git synced 2024-11-23 04:09:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[deb,rpm] Remove python2 dep

Browse Source 
[ci] Allow Dockerfiles to be reused for different base images
This commit is contained in:
Ariel Abreu 2023-11-01 18:29:48 -04:00
parent 82525f6d3a
commit 8e3da42792
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ci/Debian.Dockerfile
View File

@ -1,15 +1,16 @@
# this Dockerfile must be built using the following command: # this Dockerfile must be built using the following command:
# docker build -f ../ci/Debian.Dockerfile . # docker build -f ../ci/Debian.Dockerfile .
# this command must be run while in the `debian` directory in the root of the repo. # this command must be run while in the `debian` directory in the root of the repo.
FROM ubuntu:jammy ARG BASE_IMAGE=ubuntu:jammy
FROM $BASE_IMAGE
LABEL name=darling-build-image version=0.1.0 LABEL name=darling-build-image version=0.1.0
ARG DEBIAN_FRONTEND="noninteractive" ARG DEBIAN_FRONTEND="noninteractive"
ARG CI_UID=1111 ARG CI_UID=1111
ARG CI_GID=1111 ARG CI_GID=1111
RUN cp /etc/apt/sources.list /etc/apt/sources.list.d/sources-src.list && sed -i 's|deb http|deb-src http|g' /etc/apt/sources.list.d/sources-src.list RUN cp /etc/apt/sources.list /etc/apt/sources.list.d/sources-src.list && sed -i 's|deb http|deb-src http|g' /etc/apt/sources.list.d/sources-src.list
RUN apt-get -y update RUN apt-get -y update
RUN apt-get -y install cmake clang bison flex libfuse-dev libudev-dev pkg-config libc6-dev-i386 gcc-multilib libcairo2-dev libgl1-mesa-dev libglu1-mesa-dev libtiff5-dev libfreetype6-dev git git-lfs libelf-dev libxml2-dev libegl1-mesa-dev libfontconfig1-dev libbsd-dev libxrandr-dev libxcursor-dev libgif-dev libavutil-dev libpulse-dev libavformat-dev libavcodec-dev libswresample-dev libdbus-1-dev libxkbfile-dev libssl-dev python2 llvm-dev libvulkan-dev && apt clean -y RUN apt-get -y install cmake clang bison flex libfuse-dev libudev-dev pkg-config libc6-dev-i386 gcc-multilib libcairo2-dev libgl1-mesa-dev libglu1-mesa-dev libtiff5-dev libfreetype6-dev git git-lfs libelf-dev libxml2-dev libegl1-mesa-dev libfontconfig1-dev libbsd-dev libxrandr-dev libxcursor-dev libgif-dev libavutil-dev libpulse-dev libavformat-dev libavcodec-dev libswresample-dev libdbus-1-dev libxkbfile-dev libssl-dev llvm-dev libvulkan-dev && apt clean -y
RUN apt-get -y install lsb-release lsb-core && apt clean -y RUN apt-get -y install lsb-release && apt clean -y
RUN groupadd -g "${CI_GID}" ci RUN groupadd -g "${CI_GID}" ci
RUN useradd -u "${CI_UID}" -g "${CI_GID}" -m ci RUN useradd -u "${CI_UID}" -g "${CI_GID}" -m ci
RUN apt-get -y install devscripts equivs debhelper && apt clean -y RUN apt-get -y install devscripts equivs debhelper && apt clean -y
@ -17,6 +18,23 @@ COPY control /control
RUN mk-build-deps -i -r -t "apt-get --no-install-recommends -y" /control && apt clean -y RUN mk-build-deps -i -r -t "apt-get --no-install-recommends -y" /control && apt clean -y
RUN rm /control RUN rm /control
RUN apt-get -y install ccache && apt clean -y RUN apt-get -y install ccache && apt clean -y
RUN apt-get -y install wget gpg ca-certificates && apt clean -y
RUN if [ "$(clang --version | head -n 1 | cut -d ' ' -f 3 | cut -d '.' -f 1)" -lt 11 ]; then \
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs) main" >> /etc/apt/sources.list.d/llvm.list && \
echo "deb-src http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs) main" >> /etc/apt/sources.list.d/llvm.list && \
apt-get update; \
fi
RUN if [ "$(cmake --version | head -n 1 | cut -d ' ' -f 3 | awk '{print $1"\n3.20"}' | sort -Vr | head -n 1)" = "3.20" ]; then \
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
apt-get update; \
fi
RUN apt-get install -y --only-upgrade clang cmake && apt clean -y
RUN mkdir -p /ccache RUN mkdir -p /ccache
RUN mkdir -p /src/mnt RUN mkdir -p /src/mnt
RUN chown -R ci:ci /src RUN chown -R ci:ci /src

3
ci/RPM.Dockerfile
View File

@ -1,7 +1,8 @@
# this Dockerfile must be built using the following command: # this Dockerfile must be built using the following command:
# docker build -f ../ci/RPM.Dockerfile . # docker build -f ../ci/RPM.Dockerfile .
# this command must be run while in the `rpm` directory in the root of the repo. # this command must be run while in the `rpm` directory in the root of the repo.
FROM fedora:37 ARG BASE_IMAGE=fedora:37
FROM $BASE_IMAGE
LABEL name=darling-build-image-fedora version=0.1.0 LABEL name=darling-build-image-fedora version=0.1.0
ARG CI_UID=1111 ARG CI_UID=1111
ARG CI_GID=1111 ARG CI_GID=1111

2
debian/control vendored
View File

@ -3,7 +3,7 @@ Maintainer: Lubos Dolezel <lubos@dolezel.info>
Section: misc Section: misc
Priority: optional Priority: optional
Standards-Version: 4.4.0 Standards-Version: 4.4.0
Build-Depends: cmake, clang | clang-9, bison, flex, libfuse-dev, libudev-dev, pkg-config, libc6-dev-i386, linux-headers-amd64|linux-headers-generic, gcc-multilib, libcairo2-dev, libgl1-mesa-dev, libtiff5-dev, libfreetype6-dev, libelf-dev, libxml2-dev, libegl1-mesa-dev, libglu1-mesa-dev, libfontconfig1-dev, libbsd-dev, debhelper, ninja-build, python2, libxrandr-dev, libxcursor-dev, libgif-dev, libavcodec-dev, libavformat-dev, libswresample-dev, libavutil-dev, libpulse-dev, libavformat-dev, libavcodec-dev, libdbus-1-dev, libxkbfile-dev, libcap-dev, llvm-dev, libvulkan-dev, libcap2-bin Build-Depends: cmake, clang | clang-9, bison, flex, libfuse-dev, libudev-dev, pkg-config, libc6-dev-i386, linux-headers-amd64|linux-headers-generic, gcc-multilib, libcairo2-dev, libgl1-mesa-dev, libtiff5-dev, libfreetype6-dev, libelf-dev, libxml2-dev, libegl1-mesa-dev, libglu1-mesa-dev, libfontconfig1-dev, libbsd-dev, debhelper, ninja-build, libxrandr-dev, libxcursor-dev, libgif-dev, libavcodec-dev, libavformat-dev, libswresample-dev, libavutil-dev, libpulse-dev, libavformat-dev, libavcodec-dev, libdbus-1-dev, libxkbfile-dev, libcap-dev, llvm-dev, libvulkan-dev, libcap2-bin
Package: darling Package: darling
Architecture: amd64 Architecture: amd64

2
rpm/SPECS/darling.spec
View File

@ -32,7 +32,7 @@ BuildRequires: fuse-devel systemd-devel
BuildRequires: cairo-devel freetype-devel(x86-64) fontconfig-devel(x86-64) BuildRequires: cairo-devel freetype-devel(x86-64) fontconfig-devel(x86-64)
BuildRequires: freetype-devel(x86-32) fontconfig-devel(x86-32) make BuildRequires: freetype-devel(x86-32) fontconfig-devel(x86-32) make
BuildRequires: libjpeg-turbo-devel(x86-64) libtiff-devel(x86-64) BuildRequires: libjpeg-turbo-devel(x86-64) libtiff-devel(x86-64)
BuildRequires: libjpeg-turbo-devel(x86-32) libtiff-devel(x86-32) BuildRequires: libjpeg-turbo-devel(x86-32)
BuildRequires: libglvnd-devel mesa-libGL-devel mesa-libEGL-devel BuildRequires: libglvnd-devel mesa-libGL-devel mesa-libEGL-devel
BuildRequires: libxml2-devel elfutils-libelf-devel BuildRequires: libxml2-devel elfutils-libelf-devel
BuildRequires: libbsd-devel BuildRequires: libbsd-devel