[gjs/locale-agnostic-camel-properties: 3/5] Dockerfile: Keep deps multi-line, to make it easier to maintain
- From: Marco Trevisan <marcotrevi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/locale-agnostic-camel-properties: 3/5] Dockerfile: Keep deps multi-line, to make it easier to maintain
- Date: Thu, 28 Apr 2022 18:50:06 +0000 (UTC)
commit e7a34f66895d961573eec85734d4f665917bf0f3
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date: Thu Apr 28 20:12:13 2022 +0200
Dockerfile: Keep deps multi-line, to make it easier to maintain
test/extra/Dockerfile | 51 ++++++++++++++++++++++++++++++++++++--------
test/extra/Dockerfile.debug | 52 +++++++++++++++++++++++++++++++++++++--------
2 files changed, 85 insertions(+), 18 deletions(-)
---
diff --git a/test/extra/Dockerfile b/test/extra/Dockerfile
index 82a14024b..d44ea5c0c 100644
--- a/test/extra/Dockerfile
+++ b/test/extra/Dockerfile
@@ -39,15 +39,48 @@ ENV SHELL=/bin/bash
# Do everything in one RUN command so that the dnf cache is not cached in the
# final Docker image.
RUN dnf -y install --enablerepo=fedora-debuginfo,updates-debuginfo \
- binutils cairo-debuginfo cairo-debugsource cairo-gobject-devel clang \
- compiler-rt dbus-daemon dbus-x11 diffutils fontconfig-debuginfo \
- fontconfig-debugsource gcc-c++ git glib2-debuginfo glib2-debugsource \
- glib2-devel glibc-debuginfo glibc-debuginfo-common gnome-desktop-testing \
- gobject-introspection-debuginfo gobject-introspection-debugsource \
- gobject-introspection-devel gtk3-debuginfo gtk3-debugsource gtk3-devel \
- gtk4-debuginfo gtk4-debugsource gtk4-devel lcov libasan libubsan libtsan \
- meson ninja-build pkgconf readline-devel systemtap-sdt-devel valgrind \
- which Xvfb xz && \
+ binutils \
+ cairo-debuginfo \
+ cairo-debugsource \
+ cairo-gobject-devel \
+ clang \
+ compiler-rt \
+ dbus-daemon \
+ dbus-x11 \
+ diffutils \
+ fontconfig-debuginfo \
+ fontconfig-debugsource \
+ gcc-c++ \
+ git \
+ glib2-debuginfo \
+ glib2-debugsource \
+ glib2-devel \
+ glibc-debuginfo \
+ glibc-debuginfo-common \
+ gnome-desktop-testing \
+ gobject-introspection-debuginfo \
+ gobject-introspection-debugsource \
+ gobject-introspection-devel \
+ gtk3-debuginfo \
+ gtk3-debugsource \
+ gtk3-devel \
+ gtk4-debuginfo \
+ gtk4-debugsource \
+ gtk4-devel \
+ lcov \
+ libasan \
+ libubsan \
+ libtsan \
+ meson \
+ ninja-build \
+ pkgconf \
+ readline-devel \
+ systemtap-sdt-devel \
+ valgrind \
+ which \
+ Xvfb \
+ xz \
+ && \
dnf clean all && rm -rf /var/cache/dnf
COPY --from=mozjs-build /root/mozjs-install/usr /usr
diff --git a/test/extra/Dockerfile.debug b/test/extra/Dockerfile.debug
index 66a492aae..a77b07ea9 100644
--- a/test/extra/Dockerfile.debug
+++ b/test/extra/Dockerfile.debug
@@ -53,15 +53,49 @@ ENV SHELL=/bin/bash
# Do everything in one RUN command so that the dnf cache is not cached in the
# final Docker image.
RUN dnf -y install --enablerepo=fedora-debuginfo,updates-debuginfo \
- binutils cairo-debuginfo cairo-debugsource cairo-gobject-devel clang \
- compiler-rt dbus-daemon dbus-x11 diffutils fontconfig-debuginfo \
- fontconfig-debugsource gcc-c++ git glib2-debuginfo glib2-debugsource \
- glib2-devel glibc-debuginfo glibc-debuginfo-common gnome-desktop-testing \
- gobject-introspection-debuginfo gobject-introspection-debugsource \
- gobject-introspection-devel gtk3-debuginfo gtk3-debugsource gtk3-devel \
- gtk4-debuginfo gtk4-debugsource gtk4-devel lcov libasan libubsan libtsan \
- meson ninja-build pkgconf readline-devel sysprof-devel systemtap-sdt-devel \
- valgrind which Xvfb xz && \
+ binutils \
+ cairo-debuginfo \
+ cairo-debugsource \
+ cairo-gobject-devel \
+ clang \
+ compiler-rt \
+ dbus-daemon \
+ dbus-x11 \
+ diffutils \
+ fontconfig-debuginfo \
+ fontconfig-debugsource \
+ gcc-c++ \
+ git \
+ glib2-debuginfo \
+ glib2-debugsource \
+ glib2-devel \
+ glibc-debuginfo \
+ glibc-debuginfo-common \
+ gnome-desktop-testing \
+ gobject-introspection-debuginfo \
+ gobject-introspection-debugsource \
+ gobject-introspection-devel \
+ gtk3-debuginfo \
+ gtk3-debugsource \
+ gtk3-devel \
+ gtk4-debuginfo \
+ gtk4-debugsource \
+ gtk4-devel \
+ lcov \
+ libasan \
+ libubsan \
+ libtsan \
+ meson \
+ ninja-build \
+ pkgconf \
+ readline-devel \
+ sysprof-devel \
+ systemtap-sdt-devel \
+ valgrind \
+ which \
+ Xvfb \
+ xz \
+ && \
dnf clean all && rm -rf /var/cache/dnf
COPY --from=build /root/mozjs-install/usr /usr
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]