Update CI Dockerfiles

This commit is contained in:
Ariel Abreu 2023-09-13 16:51:50 -04:00
parent 7e4e81f52a
commit 9944ae22c9
No known key found for this signature in database
GPG Key ID: 5B88AAAF4280706F
3 changed files with 13 additions and 7 deletions

View File

@ -4,12 +4,14 @@
FROM ubuntu:jammy
LABEL name=darling-build-image version=0.1.0
ARG DEBIAN_FRONTEND="noninteractive"
ARG CI_UID=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 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 lsb-release lsb-core && apt clean -y
RUN groupadd -g 1001 ci
RUN useradd -u 1001 -g 1001 -m ci
RUN groupadd -g "${CI_GID}" ci
RUN useradd -u "${CI_UID}" -g "${CI_GID}" -m ci
RUN apt-get -y install devscripts equivs debhelper && apt clean -y
COPY control /control
RUN mk-build-deps -i -r -t "apt-get --no-install-recommends -y" /control && apt clean -y

View File

@ -3,12 +3,14 @@
# this command must be run while in the `rpm` directory in the root of the repo.
FROM fedora:37
LABEL name=darling-build-image-fedora version=0.1.0
ARG CI_UID=1111
ARG CI_GID=1111
RUN dnf install -y rpm-build dnf-utils rpmdevtools git; \
source /etc/os-release; \
dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-${VERSION_ID}.noarch.rpm; \
dnf clean all
RUN groupadd -g 1001 ci
RUN useradd -u 1001 -g 1001 -m ci
RUN groupadd -g "${CI_GID}" ci
RUN useradd -u "${CI_UID}" -g "${CI_GID}" -m ci
COPY SPECS/darling.spec /darling.spec
RUN yum-builddep -y /darling.spec; \
dnf clean all

View File

@ -1,9 +1,11 @@
FROM alpine:latest
LABEL name=darling-build-image-top version=0.1.0
ARG DOCKER_GID=975
ARG DOCKER_GID=109
ARG CI_UID=1111
ARG CI_GID=1111
RUN addgroup -g ${DOCKER_GID} -S docker
RUN apk add docker git git-lfs sed
RUN addgroup -g 1001 ci
RUN adduser -u 1001 -G ci --disabled-password ci
RUN addgroup -g "${CI_GID}" ci
RUN adduser -u "${CI_UID}" -G ci --disabled-password ci
RUN addgroup ci docker
USER ci