diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2022-04-28 20:12:13 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2022-04-28 20:36:59 +0200 |
| commit | e7a34f66895d961573eec85734d4f665917bf0f3 (patch) | |
| tree | 3047ba8093b3165c4539f76888bcac006b99ee83 /test | |
| parent | 45f7fea17f2d19c4300449faae06829f07a04844 (diff) | |
| download | gjs-e7a34f66895d961573eec85734d4f665917bf0f3.tar.gz | |
Dockerfile: Keep deps multi-line, to make it easier to maintain
Diffstat (limited to 'test')
| -rw-r--r-- | test/extra/Dockerfile | 51 | ||||
| -rw-r--r-- | test/extra/Dockerfile.debug | 52 |
2 files changed, 85 insertions, 18 deletions
diff --git a/test/extra/Dockerfile b/test/extra/Dockerfile index 82a14024..d44ea5c0 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 66a492aa..a77b07ea 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 |