diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index ed74c84..e7c4ba0 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -4,6 +4,8 @@ make build make run ``` +You can overwrite the local Ubuntu repo using `make LOCALBUILD=de build`. + ## develop backend ``` make shell diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 568f06c..e30310f 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -6,7 +6,7 @@ FROM $image as system ARG localbuild RUN echo "LOCALBUILD=$localbuild" -RUN if [ "x$localbuild" != "x" ]; then sed -i 's#http://archive.ubuntu.com/#http://tw.archive.ubuntu.com/#' /etc/apt/sources.list; fi +RUN if [ "x$localbuild" != "x" ]; then sed -i 's#http://archive.ubuntu.com/#http://'$localbuild'tw.archive.ubuntu.com/#' /etc/apt/sources.list; fi ENV DEBIAN_FRONTEND=noninteractive # && add-apt-repository ppa:fcwu-tw/apps x11vnc @@ -19,7 +19,7 @@ RUN apt-get update \ dbus-x11 x11-utils alsa-utils \ mesa-utils libgl1-mesa-dri \ lxqt openbox xvfb x11vnc \ - gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \ + gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf arc-theme \ firefox chromium-browser \ ttf-ubuntu-font-family ttf-wqy-zenhei \ && add-apt-repository -r ppa:fcwu-tw/apps \ @@ -58,7 +58,7 @@ RUN apt-get update \ FROM ubuntu:16.04 as builder ARG localbuild -RUN if [ "x$localbuild" != "x" ]; then sed -i 's#http://archive.ubuntu.com/#http://tw.archive.ubuntu.com/#' /etc/apt/sources.list; fi +RUN if [ "x$localbuild" != "x" ]; then sed -i 's#http://archive.ubuntu.com/#http://'$localbuild'tw.archive.ubuntu.com/#' /etc/apt/sources.list; fi RUN apt-get update \ && apt-get install -y --no-install-recommends curl ca-certificates diff --git a/Makefile b/Makefile index 953262c..5747f5e 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ REPO ?= dorowu/ubuntu-desktop-lxde-vnc TAG ?= latest IMAGE ?= ubuntu:18.04 -LOCALBUILD ?= 1 +LOCALBUILD ?= tw build: docker build -t $(REPO):$(TAG) --build-arg localbuild=$(LOCALBUILD) --build-arg image=$(IMAGE) . diff --git a/image/root/.config/lxqt/debug.log b/image/root/.config/lxqt/debug.log deleted file mode 100644 index fd0233f..0000000 --- a/image/root/.config/lxqt/debug.log +++ /dev/null @@ -1,70 +0,0 @@ -2018-10-22 15:13:30.616 (0x7fff75cea820) Warning: LockScreenManager couldn't start -2018-10-22 15:13:30.699 (0x7fff8f0b0ec0) Debug: New PolkitAgentListener 0x5626c54ca8e0 -2018-10-22 15:13:30.699 (0x7fff8f0b0ec0) Debug: Adding new listener PolkitQt1::Agent::Listener(0x7fff8f0b0ed0) for 0x5626c54ca8e0 -2018-10-22 15:13:30.699 (0x7fff8f0b0ec0) Warning: "Cannot create unix session: No session for pid 68" -2018-10-22 15:13:30.700 (0x7fff8f0b0ec0) Warning: "Cannot register authentication agent!" -2018-10-22 15:13:30.745 (0x7ffd1ddfa120) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.login1" "/org/freedesktop/login1" "org.freedesktop.login1.Manager" "CanHibernate" -2018-10-22 15:13:30.745 (0x7ffd1ddfa120) Warning: dbusGetProperty: QDBusInterface is invalid "org.freedesktop.UPower" "/org/freedesktop/UPower" "org.freedesktop.DBus.Properties" "CanHibernate" -2018-10-22 15:13:30.745 (0x7ffd1ddfa120) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.ConsoleKit" "/org/freedesktop/ConsoleKit/Manager" "org.freedesktop.ConsoleKit.Manager" "CanHibernate" -2018-10-22 15:13:30.745 (0x7ffd1ddfa120) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.login1" "/org/freedesktop/login1" "org.freedesktop.login1.Manager" "CanSuspend" -2018-10-22 15:13:30.745 (0x7ffd1ddfa120) Warning: dbusGetProperty: QDBusInterface is invalid "org.freedesktop.UPower" "/org/freedesktop/UPower" "org.freedesktop.DBus.Properties" "CanSuspend" -2018-10-22 15:13:30.746 (0x7ffd1ddfa120) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.ConsoleKit" "/org/freedesktop/ConsoleKit/Manager" "org.freedesktop.ConsoleKit.Manager" "CanSuspend" -2018-10-22 15:13:30.747 (0x7fff75cea820) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.login1" "/org/freedesktop/login1" "org.freedesktop.login1.Manager" "CanReboot" -2018-10-22 15:13:30.747 (0x7fff75cea820) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.ConsoleKit" "/org/freedesktop/ConsoleKit/Manager" "org.freedesktop.ConsoleKit.Manager" "CanReboot" -2018-10-22 15:13:30.747 (0x7ffd1ddfa120) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.login1" "/org/freedesktop/login1" "org.freedesktop.login1.Manager" "CanReboot" -2018-10-22 15:13:30.747 (0x7ffd1ddfa120) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.ConsoleKit" "/org/freedesktop/ConsoleKit/Manager" "org.freedesktop.ConsoleKit.Manager" "CanReboot" -2018-10-22 15:13:30.748 (0x7fff75cea820) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.login1" "/org/freedesktop/login1" "org.freedesktop.login1.Manager" "CanPowerOff" -2018-10-22 15:13:30.748 (0x7fff75cea820) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.ConsoleKit" "/org/freedesktop/ConsoleKit/Manager" "org.freedesktop.ConsoleKit.Manager" "CanPowerOff" -2018-10-22 15:13:30.748 (0x7ffd1ddfa120) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.login1" "/org/freedesktop/login1" "org.freedesktop.login1.Manager" "CanPowerOff" -2018-10-22 15:13:30.748 (0x7ffd1ddfa120) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.ConsoleKit" "/org/freedesktop/ConsoleKit/Manager" "org.freedesktop.ConsoleKit.Manager" "CanPowerOff" -2018-10-22 15:13:30.828 (0x7ffe73825cb0) Debug: () -2018-10-22 15:13:30.888 (0x7ffe73825cb0) Warning: "Section \"clock\" not found in /root/.config/lxqt/panel.conf." -2018-10-22 15:13:30.926 (0x7ffe73825cb0) Debug: WinIdChange 1200007 handle QWidgetWindow(0x560e23ae8020, name="LXQtPanel panel1Window") QScreen(0x560e2396d500, name="screen") -2018-10-22 15:13:30.936 (0x7ffe73825cb0) Debug: Systray started -2018-10-22 15:13:30.937 (0x7ffe73825cb0) Warning: Failed enumerating UDisks2 objects: "org.freedesktop.DBus.Error.Disconnected" - "Not connected to D-Bus server" -2018-10-22 15:13:30.937 (0x7ffe73825cb0) Warning: Failed enumerating UDisks2 objects: "org.freedesktop.DBus.Error.Disconnected" - "Not connected to D-Bus server" -2018-10-22 15:13:31.000 (0x7ffe5c863760) Warning: virtual QStringList Solid::Backends::UPower::UPowerManager::allDevices() error: "org.freedesktop.DBus.Error.Disconnected" -2018-10-22 15:13:31.044 (0x7ffe5c863760) Debug: BatteryChanged discharging: true chargeLevel: nan actionTime: QTime("") -2018-10-22 15:13:31.044 (0x7ffe5c863760) Debug: Could not connect to org.freedesktop.DBus.Properties.PropertiesChanged() -2018-10-22 15:13:31.045 (0x7ffe5c863760) Debug: Error from inhibit: QDBusError("org.freedesktop.DBus.Error.Disconnected", "Not connected to D-Bus server") -2018-10-22 15:13:31.045 (0x7ffe5c863760) Debug: Could not connect to org.freedesktop.DBus.Properties.PropertiesChanged() -2018-10-22 15:13:31.045 (0x7ffe5c863760) Warning: virtual QStringList Solid::Backends::UPower::UPowerManager::allDevices() error: "org.freedesktop.DBus.Error.Disconnected" -2018-10-22 15:13:31.153 (0x7ffe5c863760) Debug: Starting idlenesswatcher -2018-10-22 15:17:38.651 (0x7ffe73825cb0) Warning: QXcbConnection: XCB error: 3 (BadWindow), sequence: 2406, resource id: 39845893, major code: 18 (ChangeProperty), minor code: 0 -2018-10-22 15:19:42.253 (0x7fff1219cd70) Warning: QXcbConnection: XCB error: 3 (BadWindow), sequence: 178, resource id: 6291470, major code: 20 (GetProperty), minor code: 0 -2018-10-22 15:19:42.255 (0x7fff1219cd70) Warning: LockScreenManager couldn't start -2018-10-22 15:19:42.332 (0x7ffce1ef7a20) Debug: New PolkitAgentListener 0x55828dad9ce0 -2018-10-22 15:19:42.333 (0x7ffce1ef7a20) Debug: Adding new listener PolkitQt1::Agent::Listener(0x7ffce1ef7a30) for 0x55828dad9ce0 -2018-10-22 15:19:42.333 (0x7ffce1ef7a20) Warning: "Cannot create unix session: No session for pid 325" -2018-10-22 15:19:42.333 (0x7ffce1ef7a20) Warning: "Cannot register authentication agent!" -2018-10-22 15:19:42.350 (0x7ffdcb914b60) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.login1" "/org/freedesktop/login1" "org.freedesktop.login1.Manager" "CanHibernate" -2018-10-22 15:19:42.351 (0x7ffdcb914b60) Warning: dbusGetProperty: QDBusInterface is invalid "org.freedesktop.UPower" "/org/freedesktop/UPower" "org.freedesktop.DBus.Properties" "CanHibernate" -2018-10-22 15:19:42.351 (0x7ffdcb914b60) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.ConsoleKit" "/org/freedesktop/ConsoleKit/Manager" "org.freedesktop.ConsoleKit.Manager" "CanHibernate" -2018-10-22 15:19:42.351 (0x7ffdcb914b60) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.login1" "/org/freedesktop/login1" "org.freedesktop.login1.Manager" "CanSuspend" -2018-10-22 15:19:42.351 (0x7ffdcb914b60) Warning: dbusGetProperty: QDBusInterface is invalid "org.freedesktop.UPower" "/org/freedesktop/UPower" "org.freedesktop.DBus.Properties" "CanSuspend" -2018-10-22 15:19:42.351 (0x7ffdcb914b60) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.ConsoleKit" "/org/freedesktop/ConsoleKit/Manager" "org.freedesktop.ConsoleKit.Manager" "CanSuspend" -2018-10-22 15:19:42.352 (0x7fff1219cd70) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.login1" "/org/freedesktop/login1" "org.freedesktop.login1.Manager" "CanReboot" -2018-10-22 15:19:42.352 (0x7fff1219cd70) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.ConsoleKit" "/org/freedesktop/ConsoleKit/Manager" "org.freedesktop.ConsoleKit.Manager" "CanReboot" -2018-10-22 15:19:42.353 (0x7ffdcb914b60) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.login1" "/org/freedesktop/login1" "org.freedesktop.login1.Manager" "CanReboot" -2018-10-22 15:19:42.353 (0x7ffdcb914b60) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.ConsoleKit" "/org/freedesktop/ConsoleKit/Manager" "org.freedesktop.ConsoleKit.Manager" "CanReboot" -2018-10-22 15:19:42.357 (0x7fff1219cd70) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.login1" "/org/freedesktop/login1" "org.freedesktop.login1.Manager" "CanPowerOff" -2018-10-22 15:19:42.357 (0x7fff1219cd70) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.ConsoleKit" "/org/freedesktop/ConsoleKit/Manager" "org.freedesktop.ConsoleKit.Manager" "CanPowerOff" -2018-10-22 15:19:42.357 (0x7ffdcb914b60) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.login1" "/org/freedesktop/login1" "org.freedesktop.login1.Manager" "CanPowerOff" -2018-10-22 15:19:42.357 (0x7ffdcb914b60) Warning: dbusCall: QDBusInterface is invalid "org.freedesktop.ConsoleKit" "/org/freedesktop/ConsoleKit/Manager" "org.freedesktop.ConsoleKit.Manager" "CanPowerOff" -2018-10-22 15:19:42.454 (0x7ffebc2dcd50) Debug: () -2018-10-22 15:19:42.504 (0x7ffebc2dcd50) Warning: "Section \"clock\" not found in /root/.config/lxqt/panel.conf." -2018-10-22 15:19:42.543 (0x7ffebc2dcd50) Debug: WinIdChange 1600007 handle QWidgetWindow(0x55820329bc30, name="LXQtPanel panel1Window") QScreen(0x55820312b500, name="screen") -2018-10-22 15:19:42.552 (0x7ffebc2dcd50) Debug: Systray started -2018-10-22 15:19:42.554 (0x7ffebc2dcd50) Warning: Failed enumerating UDisks2 objects: "org.freedesktop.DBus.Error.Disconnected" - "Not connected to D-Bus server" -2018-10-22 15:19:42.554 (0x7ffebc2dcd50) Warning: Failed enumerating UDisks2 objects: "org.freedesktop.DBus.Error.Disconnected" - "Not connected to D-Bus server" -2018-10-22 15:19:42.593 (0x7ffe13772330) Debug: Starting idlenesswatcher -2018-10-22 15:19:58.629 (0x7ffebc2dcd50) Warning: Falling back to using screens root_visual. -2018-10-22 15:20:46.479 (0x7ffebc2dcd50) Warning: Falling back to using screens root_visual. -2018-10-22 15:20:51.659 (0x7ffebc2dcd50) Debug: execAction "/usr/share/applications/qterminal.desktop" -2018-10-22 15:22:00.995 (0x7ffebc2dcd50) Debug: action invoked: "0" -2018-10-22 15:22:57.962 (0x7ffebc2dcd50) Warning: Falling back to using screens root_visual. -2018-10-22 15:23:06.088 (0x7ffebc2dcd50) Debug: execAction "/usr/share/applications/pcmanfm-qt.desktop"