From a80f64bf4bbbd5bacb2ec8a1a561c712dc6175bc Mon Sep 17 00:00:00 2001 From: JezerM Date: Thu, 10 Feb 2022 19:31:58 -0600 Subject: [PATCH] Update DEBIAN and build/ci files --- build/DEBIAN/conffiles | 3 +++ build/DEBIAN/control | 4 ++-- build/ci/Dockerfile | 48 +++++++++++++++++++++++------------------- 3 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 build/DEBIAN/conffiles diff --git a/build/DEBIAN/conffiles b/build/DEBIAN/conffiles new file mode 100644 index 0000000..81edc99 --- /dev/null +++ b/build/DEBIAN/conffiles @@ -0,0 +1,3 @@ +/etc/lightdm/web-greeter.yml +/etc/lightdm/Xgreeter +/etc/xdg/lightdm/lightdm.conf.d/90-greeter-wrapper.conf diff --git a/build/DEBIAN/control b/build/DEBIAN/control index 846db39..912ad13 100644 --- a/build/DEBIAN/control +++ b/build/DEBIAN/control @@ -5,10 +5,10 @@ Replaces: lightdm-webkit-greeter Section: x11 Priority: optional Homepage: https://github.com/JezerM/web-greeter -Installed-Size: 15068 +Installed-Size: 15276 Architecture: all Maintainer: JezerM -Depends: liblightdm-gobject-1-0, liblightdm-gobject-1-dev, python3, python3-gi, python3-pyqt5, pyqt5-dev, libqt5webengine5, python3-pyqt5.qtwebengine, python3-ruamel.yaml, python3-xlib +Depends: liblightdm-gobject-1-0, liblightdm-gobject-1-dev, python3, python3-gi, python3-pyqt5, pyqt5-dev, python3-pyinotify, libqt5webengine5, python3-pyqt5.qtwebengine, python3-ruamel.yaml, libxcb1, libx11-6 Description: A modern, visually appealing greeter for LightDM. Web Greeter utilizes themes built with HTML/CSS/JavaScript for it's login screen. Web Greeter themes provide modern, visually appealing, and feature-rich login screens. Two themes are diff --git a/build/ci/Dockerfile b/build/ci/Dockerfile index 43bb08b..ade2a63 100644 --- a/build/ci/Dockerfile +++ b/build/ci/Dockerfile @@ -1,36 +1,40 @@ FROM ubuntu:20.04 -MAINTAINER Jezer Mejía +LABEL maintainer Jezer Mejía RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata +RUN DEBIAN_FRONTEND=noninteractive apt-get upgrade -y + +RUN DEBIAN_FRONTEND=noninteractive \ + apt-get install -y \ + build-essential + RUN DEBIAN_FRONTEND=noninteractive \ - apt-get install -y \ - liblightdm-gobject-1-dev \ - libqt5webengine5 \ - pyqt5-dev-tools \ - python3-gi \ - python3-pyqt5 \ - python3-ruamel.yaml \ - python3-pyinotify \ - python3-xlib \ - python3-pip + apt-get install -y \ + liblightdm-gobject-1-dev \ + gobject-introspection \ + libgirepository1.0-dev \ + libqt5webengine5 \ + pyqt5-dev-tools \ + libxcb1 \ + libx11-6 \ + libcairo2 RUN DEBIAN_FRONTEND=noninteractive \ - apt-get install -y \ - patchelf \ - rsync \ - zip \ - sudo + apt-get install -y \ + python3-gi \ + python3-pyqt5 \ + python3-pyqt5.qtwebengine \ + python3-ruamel.yaml \ + python3-pyinotify \ + python3-pip RUN DEBIAN_FRONTEND=noninteractive \ - pip3 install PyGObject \ - PyQt5 \ - PyQtWebEngine \ - ruamel.yaml \ - python-xlib \ - cx_Freeze + apt-get install -y \ + rsync \ + sudo VOLUME /build WORKDIR /build