[gnome-initial-setup/wjt/ci-refresh-dockerfile: 1/2] ci: Install malcontent from Fedora package
- From: Will Thompson <wjt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup/wjt/ci-refresh-dockerfile: 1/2] ci: Install malcontent from Fedora package
- Date: Wed, 13 Jan 2021 10:31:23 +0000 (UTC)
commit 08a1da3670678684013cba55e6f877ba9b4712c5
Author: Will Thompson <wjt endlessos org>
Date: Tue Jan 12 22:07:53 2021 +0000
ci: Install malcontent from Fedora package
.gitlab-ci/fedora.Dockerfile | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 246f4a58..1ef0ab43 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,6 +1,7 @@
FROM registry.fedoraproject.org/fedora:33
-RUN dnf -y install \
+# Malcontent is in updates-testing as of 2020-01-12
+RUN dnf -y install --enablerepo=updates-testing \
ccache \
desktop-file-utils \
gcc \
@@ -34,20 +35,12 @@ RUN dnf -y install \
"pkgconfig(libgeoclue-2.0)" \
"pkgconfig(libnm)" \
"pkgconfig(libnma)" \
+ "pkgconfig(malcontent-ui-0)" \
"pkgconfig(webkit2gtk-4.0)" \
polkit-devel \
rest-devel \
&& dnf clean all
-RUN \
- git clone https://gitlab.freedesktop.org/pwithnall/malcontent.git /tmp/malcontent && \
- pushd /tmp/malcontent && \
- git checkout tags/0.6.0 && \
- meson setup --prefix /usr _build && \
- ninja -C _build install && \
- popd && \
- rm -r /tmp/malcontent
-
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}
RUN useradd -u $HOST_USER_ID -ms /bin/bash user
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]