From 80bcf21cb200e7b743b5f3d9cbf8d6c6b14e3019 Mon Sep 17 00:00:00 2001 From: amolodykh Date: Fri, 11 May 2018 19:10:28 +0600 Subject: [PATCH 001/224] Updated ansible and replaced webview --- .travis.yml | 4 +- Dockerfile.viewer | 53 +++++++++++ ansible/roles/network/tasks/main.yml | 4 +- ansible/roles/screenly/files/X.service | 11 --- ansible/roles/screenly/files/gtkrc-2.0 | 9 -- ansible/roles/screenly/files/matchbox.service | 12 --- .../screenly/files/screenly-viewer.service | 32 ------- ansible/roles/screenly/files/uzbl-config | 2 - ansible/roles/screenly/tasks/main.yml | 58 +++++++---- ansible/roles/screenly/vars/main.yml | 5 +- ansible/roles/system/files/rc.local | 3 + ansible/roles/system/tasks/main.yml | 41 ++------ bin/install.sh | 13 ++- bin/start_viewer.sh | 33 +++++++ html_templates.py | 23 ----- requirements.txt | 3 +- requirements.viewer.txt | 11 +++ server.py | 3 - viewer.py | 95 ++++++------------- 19 files changed, 193 insertions(+), 222 deletions(-) create mode 100644 Dockerfile.viewer delete mode 100644 ansible/roles/screenly/files/X.service delete mode 100644 ansible/roles/screenly/files/gtkrc-2.0 delete mode 100644 ansible/roles/screenly/files/matchbox.service delete mode 100644 ansible/roles/screenly/files/screenly-viewer.service delete mode 100644 ansible/roles/screenly/files/uzbl-config create mode 100644 bin/start_viewer.sh delete mode 100644 html_templates.py create mode 100644 requirements.viewer.txt diff --git a/.travis.yml b/.travis.yml index 97595b5dc..94a30afd3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,10 +15,10 @@ before_install: install: - pip install -U pip - pip install -r requirements.txt + - pip install -r requirements.viewer.txt - pip install -r requirements.dev.txt before_script: - - mkdir -p ~/.screenly ~/.config/uzbl/ ~/screenly_assets - - cp ansible/roles/screenly/files/uzbl-config ~/.config/uzbl/config-screenly + - mkdir -p ~/.screenly ~/screenly_assets - cp ansible/roles/screenly/files/screenly.conf ~/.screenly/ - cp ansible/roles/screenly/files/screenly.db ~/.screenly/ - cp ansible/roles/screenly/files/screenly_utils.sh /tmp/screenly_utils.sh diff --git a/Dockerfile.viewer b/Dockerfile.viewer new file mode 100644 index 000000000..6dd12b384 --- /dev/null +++ b/Dockerfile.viewer @@ -0,0 +1,53 @@ +FROM raspbian/stretch +MAINTAINER Anton Molodykh + +RUN apt-get update && \ + apt-get -y install \ + build-essential \ + curl \ + git-core \ + gstreamer0.10-plugins-good \ + libdbus-glib-1-dev \ + libffi-dev \ + libqt5webkit5 \ + libssl-dev \ + matchbox \ + net-tools \ + omxplayer \ + psmisc \ + python-dev \ + python-gi \ + python-netifaces \ + sqlite3 \ + x11-utils \ + x11-xserver-utils \ + xserver-xorg && \ + apt-get clean + +# Install Python requirements +ADD requirements.viewer.txt /tmp/requirements.txt +RUN curl -s https://bootstrap.pypa.io/get-pip.py | python && \ + pip install -r /tmp/requirements.txt + +# Create runtime user +RUN useradd pi -d /home/pi \ + && /usr/sbin/usermod -a -G video pi + +RUN mkdir /usr/local/share/ScreenlyWebview + +RUN wget -P /tmp https://github.com/antonmolodykh/Screenly-WebVew/releases/download/0.1/screenly_webview-v0.1.tar.gz +RUN tar -xzf /tmp/screenly_webview-v0.1.tar.gz -C /tmp + +RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res +RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview + +# Fix white flickering in omxplayer +ENV NOREFRESH 1 + +# Copy X11 configs +COPY ansible/roles/system/files/10-serverflags.conf /usr/share/X11/xorg.conf.d/10-serverflags.conf +COPY ansible/roles/system/files/10-evdev.conf /usr/share/X11/xorg.conf.d/10-evdev.conf + +WORKDIR /home/pi/screenly + +CMD ["bash", "bin/start_viewer.sh"] diff --git a/ansible/roles/network/tasks/main.yml b/ansible/roles/network/tasks/main.yml index 9db34ff17..b8350094e 100644 --- a/ansible/roles/network/tasks/main.yml +++ b/ansible/roles/network/tasks/main.yml @@ -103,4 +103,6 @@ dest: "/etc/systemd/system/wifi-connect.service" - name: Enable wifi-connect systemd service - command: systemctl enable wifi-connect.service chdir=/etc/systemd/system + systemd: + name: wifi-connect.service + enabled: yes diff --git a/ansible/roles/screenly/files/X.service b/ansible/roles/screenly/files/X.service deleted file mode 100644 index b59dfee83..000000000 --- a/ansible/roles/screenly/files/X.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=X11 -After=network.target - -[Service] -ExecStart=/usr/bin/X -User=root -Restart=on-failure - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/ansible/roles/screenly/files/gtkrc-2.0 b/ansible/roles/screenly/files/gtkrc-2.0 deleted file mode 100644 index 8d399f94f..000000000 --- a/ansible/roles/screenly/files/gtkrc-2.0 +++ /dev/null @@ -1,9 +0,0 @@ -style "uzbl" { - GtkScrollbar::slider-width=0 - GtkScrollbar::trough-border=0 - GtkScrollbar::has-backward-stepper=0 - GtkScrollbar::has-forward-stepper=0 - GtkScrollbar::has-secondary-backward-stepper=0 - GtkScrollbar::has-secondary-forward-stepper=0 -} -widget "Uzbl*" style "uzbl" diff --git a/ansible/roles/screenly/files/matchbox.service b/ansible/roles/screenly/files/matchbox.service deleted file mode 100644 index 6bb0b06df..000000000 --- a/ansible/roles/screenly/files/matchbox.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=X11 -After=X.service - -[Service] -Environment=DISPLAY=:0.0 -ExecStart=/usr/bin/matchbox-window-manager -use_titlebar no -use_cursor no -User=pi -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/ansible/roles/screenly/files/screenly-viewer.service b/ansible/roles/screenly/files/screenly-viewer.service deleted file mode 100644 index e606d80b2..000000000 --- a/ansible/roles/screenly/files/screenly-viewer.service +++ /dev/null @@ -1,32 +0,0 @@ -[Unit] -Description=Screenly Viewer -After=matchbox.service screenly-web.service - -[Service] -WorkingDirectory=/home/pi/screenly -User=pi - -Environment=DISPLAY=:0.0 - -# Fix white flickering in omxplayer -Environment=NOREFRESH=1 - -Environment=PYTHONPATH=/home/pi/screenly - -# Don't activate screensaver -ExecStartPre=/usr/bin/xset s off - -# Disable DPMS (Energy Star) features -ExecStartPre=/usr/bin/xset -dpms - -# Don't blank the video device -ExecStartPre=/usr/bin/xset s noblank - -ExecStart=/usr/bin/python /home/pi/screenly/viewer.py -Restart=on-failure - -ExecStartPost=/bin/rm -f /tmp/uzbl_* -ExecStartPost=/bin/rm -f /tmp/screenly_html/* - -[Install] -WantedBy=multi-user.target diff --git a/ansible/roles/screenly/files/uzbl-config b/ansible/roles/screenly/files/uzbl-config deleted file mode 100644 index 6d6609434..000000000 --- a/ansible/roles/screenly/files/uzbl-config +++ /dev/null @@ -1,2 +0,0 @@ -set show_status = 0 -set ssl_verify = 1 diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index ae5c1ad04..9bed3934f 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -1,13 +1,9 @@ -- name: Ensure folders exist +- name: Ensure folder exist file: - path: "/home/pi/{{ item }}" + path: "/home/pi/.screenly" state: directory owner: pi group: pi - with_items: - - .screenly - - .config - - .config/uzbl - name: Copy Screenly default config copy: @@ -23,20 +19,6 @@ state: absent dest: /home/pi/.screenly/screenly.conf -- name: Copy in GTK config - copy: - owner: pi - group: pi - src: gtkrc-2.0 - dest: /home/pi/.gtkrc-2.0 - -- name: Copy in UZBL config - copy: - owner: pi - group: pi - src: uzbl-config - dest: /home/pi/.config/uzbl/config-screenly - - name: Install pip dependencies pip: requirements=/home/pi/screenly/requirements.txt @@ -85,5 +67,39 @@ with_items: "{{ screenly_systemd_units }}" - name: Enable screenly systemd services - command: systemctl enable {{ item }} chdir=/etc/systemd/system + systemd: + name: "{{ item }}" + enabled: yes with_items: "{{ screenly_systemd_units }}" + +- name: Disable deprecated systemd services + systemd: + name: "{{ item }}" + enabled: no + with_items: + - screenly-viewer.service + - matchbox.service + - X.service + +- name: Remove deprecated systemd units + file: + path: "/etc/systemd/system/{{ item }}" + state: absent + with_items: + - screenly-viewer.service + - matchbox.service + - X.service + +- name: Create screenly-viewer container + docker_container: + name: screenly-viewer + image: amolodykh/screenly-viewer + pull: true + state: present + restart_policy: unless-stopped + network_mode: host + privileged: yes + volumes: + - /home/pi/screenly:/home/pi/screenly + - /home/pi/.screenly:/home/pi/.screenly + - /home/pi/screenly_assets:/home/pi/screenly_assets diff --git a/ansible/roles/screenly/vars/main.yml b/ansible/roles/screenly/vars/main.yml index 833bb6d8b..bf3e5aaf6 100644 --- a/ansible/roles/screenly/vars/main.yml +++ b/ansible/roles/screenly/vars/main.yml @@ -1,6 +1,3 @@ screenly_systemd_units: - - X.service - - matchbox.service - - screenly-viewer.service - screenly-web.service - - screenly-websocket_server_layer.service \ No newline at end of file + - screenly-websocket_server_layer.service diff --git a/ansible/roles/system/files/rc.local b/ansible/roles/system/files/rc.local index 46b4e9848..ea1378fa1 100644 --- a/ansible/roles/system/files/rc.local +++ b/ansible/roles/system/files/rc.local @@ -3,6 +3,9 @@ # Make sure the SSH host keys have been generated ssh-keygen -A +# Solves issue with black square in the upper left-hand corner +/bin/chvt 8 ; sleep 0.1 ; /bin/chvt 7 + # Disable wifi power management iwconfig wlan0 power off diff --git a/ansible/roles/system/tasks/main.yml b/ansible/roles/system/tasks/main.yml index 7a71c7077..f95c58b70 100644 --- a/ansible/roles/system/tasks/main.yml +++ b/ansible/roles/system/tasks/main.yml @@ -150,17 +150,10 @@ - console-data - libffi-dev - libssl-dev - - matchbox - - omxplayer - python-dev - - python-netifaces - - python-simplejson - rpi-update - sqlite3 - systemd - - uzbl - - x11-xserver-utils - - xserver-xorg - name: Install systemd-sysv on Wheezy command: bash -c 'echo "Yes, do as I say!" | apt-get install -y --force-yes systemd-sysv' @@ -171,10 +164,15 @@ name: "{{ item }}" state: absent with_items: - - supervisor + - dphys-swapfile - lightdm - lightdm-gtk-greeter - - dphys-swapfile + - matchbox + - omxplayer + - supervisor + - uzbl + - x11-xserver-utils + - xserver-xorg - name: Perform system upgrade apt: @@ -208,31 +206,6 @@ owner: root group: root -- name: Copy in evdev - copy: - src: 10-evdev.conf - dest: /usr/share/X11/xorg.conf.d/10-evdev.conf - mode: 0644 - owner: root - group: root - -- name: Disable DPMS - copy: - src: 10-serverflags.conf - dest: /usr/share/X11/xorg.conf.d/10-serverflags.conf - mode: 0644 - owner: root - group: root - -- name: Clear out X11 configs (disables touchpad and other unnecessary things) - file: - path: "/usr/share/X11/xorg.conf.d/{{ item }}" - state: absent - with_items: - - 50-synaptics.conf - - 10-quirks.conf - - 50-wacom.conf - - name: Disable swap command: /sbin/swapoff --all removes=/var/swap diff --git a/bin/install.sh b/bin/install.sh index 314f40718..1c31eef91 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -65,7 +65,18 @@ sudo apt-get update sudo apt-get purge -y python-setuptools python-pip python-pyasn1 sudo apt-get install -y python-dev git-core libffi-dev libssl-dev curl -s https://bootstrap.pypa.io/get-pip.py | sudo python -sudo pip install ansible==2.1.0.0 + +docker -v > /dev/null +if [ "$?" != '0' ]; then + sudo apt-get install -y apt-transport-https ca-certificates curl + curl -fsSL "https://download.docker.com/linux/raspbian/gpg" | apt-key add -qq - >/dev/null + echo "deb [arch=armhf] https://download.docker.com/linux/raspbian stretch edge" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null + sudo apt-get update + sudo apt-get install -y -qq --no-install-recommends docker-ce + sudo usermod -aG docker pi +fi + +sudo pip install ansible==2.5.2 ansible localhost -m git -a "repo=${1:-https://github.com/screenly/screenly-ose.git} dest=/home/pi/screenly version=$BRANCH" cd /home/pi/screenly/ansible diff --git a/bin/start_viewer.sh b/bin/start_viewer.sh new file mode 100644 index 000000000..28dd5b83e --- /dev/null +++ b/bin/start_viewer.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +# SUGUSR1 from the viewer is also sent to the container +# Prevent it so that the container does not fall +trap '' 16 + +# Start X +rm -f /tmp/.X0-lock +/usr/bin/X & +export DISPLAY=:0.0 + +# Waiting for X11 +while ! xdpyinfo >/dev/null 2>&1; do + sleep 0.5 +done + +su - pi -c " /usr/bin/matchbox-window-manager -use_titlebar no -use_cursor no &" + +su - pi -c "cd /home/pi/screenly && dbus-run-session python viewer.py &" + +# Waiting for the viewer +while true; do + PID=$(pidof python) + if [ "$?" == '0' ]; then + break + fi + sleep 0.5 +done + +# Exit when the viewer falls +while kill -0 "$PID"; do + sleep 1 +done diff --git a/html_templates.py b/html_templates.py deleted file mode 100644 index 29ddbe967..000000000 --- a/html_templates.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf8 -*- - - -def black_page(filepath): - html = """ - - - - -""" - - with open(filepath, 'w') as f: - f.write(html) - return filepath diff --git a/requirements.txt b/requirements.txt index 84cc51351..bd89bcd10 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ -Mako==0.7.3 MarkupSafe==1.0 ansible==2.5.3 certifi==2018.4.16 cffi==1.7.0 configparser==3.5.0 +docker-py==1.10.6 Flask-Cors==3.0.4 flask-restful-swagger-2==0.35 flask-swagger-ui==3.0.12 @@ -14,7 +14,6 @@ gevent-websocket==0.10.1 gevent==1.2.2 gunicorn==19.8.1 hurry.filesize==0.9 -mixpanel==4.3.2 netifaces==0.10.4 pwgen==0.8.2.post0 pyasn1==0.1.8 diff --git a/requirements.viewer.txt b/requirements.viewer.txt new file mode 100644 index 000000000..1b065e278 --- /dev/null +++ b/requirements.viewer.txt @@ -0,0 +1,11 @@ +certifi==2018.4.16 +configparser==3.5.0 +flask==0.12.2 +mixpanel==4.3.2 +netifaces==0.10.4 +python-dateutil==2.4.2 +pytz==2012d +pyzmq==16.0.2 +pydbus==0.6.0 +requests[security]==2.18.4 +sh==1.08 \ No newline at end of file diff --git a/server.py b/server.py index 4cde0b82c..8450a3e66 100755 --- a/server.py +++ b/server.py @@ -12,11 +12,8 @@ import json from mimetypes import guess_type from os import getenv, makedirs, mkdir, path, remove, rename, statvfs -from pwgen import pwgen -import sh from sh import git from subprocess import check_output -from time import sleep import traceback import uuid diff --git a/viewer.py b/viewer.py index 8e36f958f..9b0f1e0d5 100755 --- a/viewer.py +++ b/viewer.py @@ -9,17 +9,16 @@ from mixpanel import Mixpanel, MixpanelException from netifaces import gateways -from requests import get as req_get from signal import signal, SIGUSR1 from time import sleep import logging +from pydbus import SessionBus import random import sh import string import zmq from settings import settings, LISTEN, PORT -import html_templates from lib.github import fetch_remote_hash, remote_branch_available from lib.utils import url_fails, touch, is_ci from lib import db @@ -35,16 +34,14 @@ EMPTY_PL_DELAY = 5 # secs INITIALIZED_FILE = '/.screenly/initialized' -BLACK_PAGE = '/tmp/screenly_html/black_page.html' WATCHDOG_PATH = '/tmp/screenly.watchdog' -SCREENLY_HTML = '/tmp/screenly_html/' LOAD_SCREEN = '/screenly/loading.png' # relative to $HOME -UZBLRC = '/.config/uzbl/config-screenly' # relative to $HOME -INTRO = '/screenly/intro-template.html' current_browser_url = None browser = None +browser_bus = None + VIDEO_TIMEOUT = 20 # secs HOME = None @@ -217,66 +214,35 @@ def watchdog(): utime(WATCHDOG_PATH, None) -def load_browser(url=None): - global browser, current_browser_url +def load_browser(): + global browser logging.info('Loading browser...') - if browser: - logging.info('killing previous uzbl %s', browser.pid) - browser.process.kill() - - if url is not None: - current_browser_url = url - - # --config=- read commands (and config) from stdin - # --print-events print events to stdout - browser = sh.Command('uzbl-browser')(print_events=True, config='-', uri=current_browser_url, _bg=True) - logging.info('Browser loading %s. Running as PID %s.', current_browser_url, browser.pid) - - uzbl_rc = 'set ssl_verify = {}\n'.format('1' if settings['verify_ssl'] else '0') - with open(HOME + UZBLRC) as f: # load uzbl.rc - uzbl_rc = f.read() + uzbl_rc - browser_send(uzbl_rc) + browser = sh.Command('ScreenlyWebview')(_bg=True, _err_to_out=True) + while 'Screenly service start' not in browser.process.stdout: + sleep(1) -def browser_send(command, cb=lambda _: True): - if not (browser is None) and browser.process.alive: - while not browser.process._pipe_queue.empty(): # flush stdout - browser.next() +def view_webpage(uri): + global current_browser_url - browser.process.stdin.put(command + '\n') - while True: # loop until cb returns True - if cb(browser.next()): - break - else: - logging.info('browser found dead, restarting') + if browser is None or not browser.process.alive: load_browser() + if current_browser_url is not uri: + browser_bus.loadPage(uri) + current_browser_url = uri + logging.info('current url is {0}'.format(current_browser_url)) -def browser_clear(force=False): - """Load a black page. Default cb waits for the page to load.""" - browser_url('file://' + BLACK_PAGE, force=force, cb=lambda buf: 'LOAD_FINISH' in buf and BLACK_PAGE in buf) - - -def browser_url(url, cb=lambda _: True, force=False): +def view_image(uri): global current_browser_url - if url == current_browser_url and not force: - logging.debug('Already showing %s, reloading it.', current_browser_url) - else: - current_browser_url = url - - """Uzbl handles full URI format incorrect: scheme://uname:passwd@domain:port/path - We need to escape @""" - escaped_url = current_browser_url.replace('@', '\\@') - - browser_send('uri ' + escaped_url, cb=cb) - logging.info('current url is %s', current_browser_url) - - -def view_image(uri): - browser_clear() - browser_send('js window.setimg("{0}")'.format(uri), cb=lambda b: 'COMMAND_EXECUTED' in b and 'setimg' in b) + if browser is None or not browser.process.alive: + load_browser() + if current_browser_url is not uri: + browser_bus.loadImage(uri) + current_browser_url = uri + logging.info('current url is {0}'.format(current_browser_url)) def view_video(uri, duration): @@ -294,7 +260,7 @@ def view_video(uri, duration): run = sh.Command(player_args[0])(*player_args[1:], **player_kwargs) - browser_clear(force=True) + browser_bus.loadImage('null') try: while run.process.alive: watchdog() @@ -393,9 +359,7 @@ def asset_loop(scheduler): if 'image' in mime: view_image(uri) elif 'web' in mime: - # FIXME If we want to force periodic reloads of repeated web assets, force=True could be used here. - # See e38e6fef3a70906e7f8739294ffd523af6ce66be. - browser_url(uri) + view_webpage(uri) elif 'video' or 'streaming' in mime: view_video(uri, asset['duration']) else: @@ -411,7 +375,7 @@ def asset_loop(scheduler): def setup(): - global HOME, arch, db_conn + global HOME, arch, db_conn, browser_bus HOME = getenv('HOME', '/home/pi') arch = machine() @@ -420,8 +384,9 @@ def setup(): load_settings() db_conn = db.conn(settings['database']) - sh.mkdir(SCREENLY_HTML, p=True) - html_templates.black_page(BLACK_PAGE) + load_browser() + bus = SessionBus() + browser_bus = bus.get('screenly.webview', '/Screenly') def main(): @@ -429,13 +394,13 @@ def main(): if not path.isfile(HOME + INITIALIZED_FILE) and not gateways().get('default'): url = 'http://{0}/hotspot'.format(LISTEN) - load_browser(url=url) + view_webpage(url) while not path.isfile(HOME + INITIALIZED_FILE): sleep(1) url = 'http://{0}:{1}/splash_page'.format(LISTEN, PORT) if settings['show_splash'] else 'file://' + BLACK_PAGE - browser_url(url=url) + view_webpage(url) if settings['show_splash']: sleep(SPLASH_DELAY) From 2f8555a5c1b8ac8d38f564642320f2a8eb4dd0af Mon Sep 17 00:00:00 2001 From: amolodykh Date: Tue, 15 May 2018 19:52:32 +0600 Subject: [PATCH 002/224] Move all things to docker --- .travis.yml | 5 ++- Dockerfile => Dockerfile.server | 22 +++------- Dockerfile.template | 8 +++- Dockerfile.viewer | 8 +++- Dockerfile.websocket_server | 23 ++++++++++ ansible/roles/nginx/tasks/main.yml | 7 --- ansible/roles/screenly/tasks/main.yml | 61 ++++++++++++++++++--------- ansible/roles/screenly/vars/main.yml | 5 ++- ansible/roles/ssl/tasks/main.yml | 12 ------ ansible/roles/system/tasks/main.yml | 7 +-- ansible/site.yml | 18 -------- bin/install.sh | 6 +-- requirements.server.txt | 22 ++++++++++ requirements.txt | 25 ----------- requirements.websocket_server.txt | 7 +++ server.py | 28 ++++++------ templates/system_info.html | 4 +- 17 files changed, 137 insertions(+), 131 deletions(-) rename Dockerfile => Dockerfile.server (57%) create mode 100644 Dockerfile.websocket_server create mode 100644 requirements.server.txt create mode 100644 requirements.websocket_server.txt diff --git a/.travis.yml b/.travis.yml index 94a30afd3..6fd44d345 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,12 @@ addons: before_install: - sudo add-apt-repository ppa:mc3man/trusty-media -y - sudo apt-get update -q - - sudo apt-get install ffmpeg + - sudo apt-get install ffmpeg python-gi python-dev install: - pip install -U pip - - pip install -r requirements.txt + - pip install ansible==2.5.2 - pip install -r requirements.viewer.txt + - pip install -r requirements.server.txt - pip install -r requirements.dev.txt before_script: - mkdir -p ~/.screenly ~/screenly_assets diff --git a/Dockerfile b/Dockerfile.server similarity index 57% rename from Dockerfile rename to Dockerfile.server index 5edfceac1..85fdd6d04 100644 --- a/Dockerfile +++ b/Dockerfile.server @@ -1,44 +1,32 @@ -FROM debian:stretch -MAINTAINER Viktor Petersson +FROM raspbian/stretch +MAINTAINER Anton Molodykh RUN apt-get update && \ apt-get -y install \ build-essential \ curl \ - ffmpeg \ git-core \ libffi-dev \ libssl-dev \ - mplayer \ net-tools \ - procps \ python-dev \ - python-imaging \ python-netifaces \ - python-simplejson \ - sqlite3 \ - && \ + sqlite3 && \ apt-get clean # Install Python requirements -ADD requirements.txt /tmp/requirements.txt +ADD requirements.server.txt /tmp/requirements.txt RUN curl -s https://bootstrap.pypa.io/get-pip.py | python && \ pip install -r /tmp/requirements.txt # Create runtime user RUN useradd pi -# Install config file and file structure RUN mkdir -p /home/pi/.screenly /home/pi/screenly /home/pi/screenly_assets -COPY ansible/roles/screenly/files/screenly.conf /home/pi/.screenly/screenly.conf - -# Copy in code base -COPY . /home/pi/screenly RUN chown -R pi:pi /home/pi USER pi -WORKDIR /home/pi/screenly -EXPOSE 8080 +WORKDIR /home/pi/screenly CMD python server.py diff --git a/Dockerfile.template b/Dockerfile.template index 6ac2eb068..2b125eed5 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -27,9 +27,13 @@ RUN rm /etc/nginx/sites-enabled/default COPY ansible/roles/ssl/files/nginx_resin.conf /etc/nginx/sites-enabled/screenly.conf # Install Python requirements -ADD requirements.txt /tmp/requirements.txt +ADD requirements.viewer.txt /tmp/requirements.viewer.txt +ADD requirements.server.txt /tmp/requirements.server.txt +ADD requirements.websocket_server.txt /tmp/requirements.websocket_server.txt RUN curl -s https://bootstrap.pypa.io/get-pip.py | python && \ - pip install --upgrade -r /tmp/requirements.txt + pip install --upgrade -r /tmp/requirements.viewer.txt && \ + pip install --upgrade -r /tmp/requirements.server.txt && \ + pip install --upgrade -r /tmp/requirements.websocket_server.txt # Screenly Websocker Server COPY ansible/roles/screenly/files/screenly-websocket_server_layer.service /etc/systemd/system/screenly-websocket_server_layer.service diff --git a/Dockerfile.viewer b/Dockerfile.viewer index 6dd12b384..b4671afbc 100644 --- a/Dockerfile.viewer +++ b/Dockerfile.viewer @@ -10,6 +10,7 @@ RUN apt-get update && \ libdbus-glib-1-dev \ libffi-dev \ libqt5webkit5 \ + libraspberrypi0 \ libssl-dev \ matchbox \ net-tools \ @@ -32,11 +33,14 @@ RUN curl -s https://bootstrap.pypa.io/get-pip.py | python && \ # Create runtime user RUN useradd pi -d /home/pi \ && /usr/sbin/usermod -a -G video pi +RUN mkdir -p /home/pi/.screenly /home/pi/screenly /home/pi/screenly_assets + +RUN chown -R pi:pi /home/pi RUN mkdir /usr/local/share/ScreenlyWebview -RUN wget -P /tmp https://github.com/antonmolodykh/Screenly-WebVew/releases/download/0.1/screenly_webview-v0.1.tar.gz -RUN tar -xzf /tmp/screenly_webview-v0.1.tar.gz -C /tmp +RUN wget -P /tmp https://github.com/antonmolodykh/Screenly-WebVew/releases/download/0.1/screenly-webview-v0.1.tar.gz +RUN tar -xzf /tmp/screenly-webview-v0.1.tar.gz -C /tmp RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview diff --git a/Dockerfile.websocket_server b/Dockerfile.websocket_server new file mode 100644 index 000000000..4eed4c082 --- /dev/null +++ b/Dockerfile.websocket_server @@ -0,0 +1,23 @@ +FROM raspbian/stretch +MAINTAINER Anton Molodykh + +RUN apt-get update && \ + apt-get -y install \ + build-essential \ + curl \ + libffi-dev \ + python-dev && \ + apt-get clean + +# Install Python requirements +ADD requirements.websocket_server.txt /tmp/requirements.txt +RUN curl -s https://bootstrap.pypa.io/get-pip.py | python && \ + pip install -r /tmp/requirements.txt + +# Create runtime user +RUN useradd pi + +USER pi +WORKDIR /home/pi/screenly + +CMD python websocket_server_layer.py diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml index dc2561c97..18e610a30 100644 --- a/ansible/roles/nginx/tasks/main.yml +++ b/ansible/roles/nginx/tasks/main.yml @@ -24,10 +24,3 @@ mode: 644 owner: root group: root - -- name: Modifies screenly-web service to only listen on localhost - lineinfile: - regexp: '^.*LISTEN.*' - state: absent - dest: /etc/systemd/system/screenly-web.service - when: no_ssl diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index 9bed3934f..586dafe21 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -1,9 +1,12 @@ -- name: Ensure folder exist +- name: Ensure folders exist file: - path: "/home/pi/.screenly" + path: "/home/pi/{{ item }}" state: directory owner: pi group: pi + with_items: + - .screenly + - screenly_assets - name: Copy Screenly default config copy: @@ -60,35 +63,39 @@ owner: root group: root -- name: Copy screenly systemd units - copy: - src: "{{ item }}" - dest: "/etc/systemd/system/{{ item }}" - with_items: "{{ screenly_systemd_units }}" +- name: Check if deprecated systemd services exists + stat: + path: /etc/systemd/system/X.service + register: X_service -- name: Enable screenly systemd services - systemd: - name: "{{ item }}" - enabled: yes - with_items: "{{ screenly_systemd_units }}" +- set_fact: X_service_exist="{{X_service.stat.exists}}" - name: Disable deprecated systemd services systemd: name: "{{ item }}" enabled: no - with_items: - - screenly-viewer.service - - matchbox.service - - X.service + with_items: "{{ screenly_systemd_units }}" + when: X_service_exist - name: Remove deprecated systemd units file: path: "/etc/systemd/system/{{ item }}" state: absent - with_items: - - screenly-viewer.service - - matchbox.service - - X.service + with_items: "{{ screenly_systemd_units }}" + +- name: Create screenly-server container + docker_container: + name: screenly-server + image: amolodykh/screenly-server + pull: true + state: present + recreate: true + restart_policy: unless-stopped + network_mode: host + volumes: + - /home/pi/screenly:/home/pi/screenly + - /home/pi/.screenly:/home/pi/.screenly + - /home/pi/screenly_assets:/home/pi/screenly_assets - name: Create screenly-viewer container docker_container: @@ -96,6 +103,7 @@ image: amolodykh/screenly-viewer pull: true state: present + recreate: true restart_policy: unless-stopped network_mode: host privileged: yes @@ -103,3 +111,16 @@ - /home/pi/screenly:/home/pi/screenly - /home/pi/.screenly:/home/pi/.screenly - /home/pi/screenly_assets:/home/pi/screenly_assets + +- name: Create screenly-websocket-server container + docker_container: + name: screenly-websocket-server + image: amolodykh/screenly-websocket-server + pull: true + state: present + recreate: true + restart_policy: unless-stopped + network_mode: host + volumes: + - /home/pi/screenly:/home/pi/screenly + - /home/pi/.screenly:/home/pi/.screenly diff --git a/ansible/roles/screenly/vars/main.yml b/ansible/roles/screenly/vars/main.yml index bf3e5aaf6..833bb6d8b 100644 --- a/ansible/roles/screenly/vars/main.yml +++ b/ansible/roles/screenly/vars/main.yml @@ -1,3 +1,6 @@ screenly_systemd_units: + - X.service + - matchbox.service + - screenly-viewer.service - screenly-web.service - - screenly-websocket_server_layer.service + - screenly-websocket_server_layer.service \ No newline at end of file diff --git a/ansible/roles/ssl/tasks/main.yml b/ansible/roles/ssl/tasks/main.yml index ace2021f0..48126ce66 100644 --- a/ansible/roles/ssl/tasks/main.yml +++ b/ansible/roles/ssl/tasks/main.yml @@ -68,15 +68,3 @@ tags: - enable-ssl when: not no_use_ssl_parameter - -- name: Modifies screenly-web service to only listen on localhost - lineinfile: - regexp: '^.*LISTEN.*' - state: absent - dest: /etc/systemd/system/screenly-web.service - notify: - - reload systemctl - - restart-screenly-websocket_server_layer - - restart-screenly-server - tags: - - enable-ssl diff --git a/ansible/roles/system/tasks/main.yml b/ansible/roles/system/tasks/main.yml index f95c58b70..77ebf0667 100644 --- a/ansible/roles/system/tasks/main.yml +++ b/ansible/roles/system/tasks/main.yml @@ -151,14 +151,10 @@ - libffi-dev - libssl-dev - python-dev + - python-netifaces - rpi-update - - sqlite3 - systemd -- name: Install systemd-sysv on Wheezy - command: bash -c 'echo "Yes, do as I say!" | apt-get install -y --force-yes systemd-sysv' - when: ansible_distribution_release == "wheezy" - - name: Remove deprecated apt dependencies apt: name: "{{ item }}" @@ -169,6 +165,7 @@ - lightdm-gtk-greeter - matchbox - omxplayer + - sqlite3 - supervisor - uzbl - x11-xserver-utils diff --git a/ansible/site.yml b/ansible/site.yml index bf5b95200..36bdfc16f 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -9,24 +9,6 @@ name: nginx state: restarted - - name: reload systemctl - command: systemctl daemon-reload - - - name: restart-screenly-websocket_server_layer - command: systemctl restart screenly-websocket_server_layer.service - - - name: restart-screenly-server - command: systemctl restart screenly-web.service - - - name: restart-x-server - command: "systemctl restart {{ item }}" - with_items: - - X.service - - matchbox.service - - - name: restart-screenly-viewer - command: systemctl restart screenly-viewer.service - roles: - system - network diff --git a/bin/install.sh b/bin/install.sh index 1c31eef91..60b67cd9b 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -69,10 +69,10 @@ curl -s https://bootstrap.pypa.io/get-pip.py | sudo python docker -v > /dev/null if [ "$?" != '0' ]; then sudo apt-get install -y apt-transport-https ca-certificates curl - curl -fsSL "https://download.docker.com/linux/raspbian/gpg" | apt-key add -qq - >/dev/null + curl -fsSL "https://download.docker.com/linux/raspbian/gpg" | sudo apt-key add -qq - >/dev/null echo "deb [arch=armhf] https://download.docker.com/linux/raspbian stretch edge" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null sudo apt-get update - sudo apt-get install -y -qq --no-install-recommends docker-ce + sudo apt-get install -y --no-install-recommends docker-ce sudo usermod -aG docker pi fi @@ -93,8 +93,6 @@ sudo find /usr/share/locale -mindepth 1 -maxdepth 1 ! -name 'en*' ! -name 'de*' cd ~/screenly && git rev-parse HEAD > ~/.screenly/latest_screenly_sha -if test -f ~/.screenly/wifi_set; then rm ~/.screenly/wifi_set; fi - set +x echo "Installation completed." diff --git a/requirements.server.txt b/requirements.server.txt new file mode 100644 index 000000000..343a0743f --- /dev/null +++ b/requirements.server.txt @@ -0,0 +1,22 @@ +certifi==2018.4.16 +configparser==3.5.0 +Flask-Cors==3.0.4 +flask-restful-swagger-2==0.35 +flask-swagger-ui==3.0.12 +flask==0.12.2 +flask_restful==0.3.6 +futures==3.0.5 +gunicorn==19.8.1 +hurry.filesize==0.9 +netifaces==0.10.4 +pyasn1==0.1.8 +python-dateutil==2.4.2 +pytz==2012d +pyzmq==16.0.2 +requests[security]==2.18.4 +sh==1.08 +six==1.11.0 +uptime==2.0.2 +werkzeug==0.10.4 +wsgiref==0.1.2 +youtube_dl>=2017.7.2 diff --git a/requirements.txt b/requirements.txt index bd89bcd10..970d6ad48 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,29 +1,4 @@ -MarkupSafe==1.0 -ansible==2.5.3 -certifi==2018.4.16 -cffi==1.7.0 -configparser==3.5.0 docker-py==1.10.6 -Flask-Cors==3.0.4 -flask-restful-swagger-2==0.35 -flask-swagger-ui==3.0.12 -flask==0.12.2 -flask_restful==0.3.6 -futures==3.0.5 -gevent-websocket==0.10.1 -gevent==1.2.2 -gunicorn==19.8.1 -hurry.filesize==0.9 netifaces==0.10.4 pwgen==0.8.2.post0 -pyasn1==0.1.8 -python-dateutil==2.4.2 -pytz==2012d -pyzmq==16.0.2 -requests[security]==2.18.4 sh==1.08 -six==1.11.0 -uptime==2.0.2 -werkzeug==0.10.4 -wsgiref==0.1.2 -youtube_dl>=2017.7.2 diff --git a/requirements.websocket_server.txt b/requirements.websocket_server.txt new file mode 100644 index 000000000..a5ef325d5 --- /dev/null +++ b/requirements.websocket_server.txt @@ -0,0 +1,7 @@ +configparser==3.5.0 +flask==0.12.2 +gevent-websocket==0.10.1 +gevent==1.2.2 +pyasn1==0.1.8 +pyzmq==16.0.2 +six==1.11.0 diff --git a/server.py b/server.py index 8450a3e66..47365c987 100755 --- a/server.py +++ b/server.py @@ -661,19 +661,19 @@ class Info(Resource): method_decorators = [api_response, auth_basic] def get(self): - viewlog = None - try: - viewlog = [line.decode('utf-8') for line in - check_output(['sudo', 'systemctl', 'status', 'screenly-viewer.service', '-n', '20']).split('\n')] - except: - pass + # viewlog = None + # try: + # viewlog = [line.decode('utf-8') for line in + # check_output(['sudo', 'systemctl', 'status', 'screenly-viewer.service', '-n', '20']).split('\n')] + # except: + # pass # Calculate disk space slash = statvfs("/") free_space = size(slash.f_bavail * slash.f_frsize) return { - 'viewlog': viewlog, + # 'viewlog': viewlog, 'loadavg': diagnostics.get_load_avg()['15 min'], 'free_space': free_space, 'display_info': diagnostics.get_monitor_status(), @@ -804,12 +804,12 @@ def settings_page(): @app.route('/system_info') @auth_basic def system_info(): - viewlog = None - try: - viewlog = [line.decode('utf-8') for line in - check_output(['sudo', 'systemctl', 'status', 'screenly-viewer.service', '-n', '20']).split('\n')] - except: - pass + # viewlog = None + # try: + # viewlog = [line.decode('utf-8') for line in + # check_output(['sudo', 'systemctl', 'status', 'screenly-viewer.service', '-n', '20']).split('\n')] + # except: + # pass loadavg = diagnostics.get_load_avg()['15 min'] @@ -831,7 +831,7 @@ def system_info(): return template( 'system_info.html', player_name=player_name, - viewlog=viewlog, + # viewlog=viewlog, loadavg=loadavg, free_space=free_space, uptime=system_uptime, diff --git a/templates/system_info.html b/templates/system_info.html index fb686ec9a..dbe145e91 100644 --- a/templates/system_info.html +++ b/templates/system_info.html @@ -75,7 +75,7 @@

-
+ From 90bc957f6a78641820b151d1ecd5375162289ab2 Mon Sep 17 00:00:00 2001 From: amolodykh Date: Mon, 21 May 2018 12:38:46 +0600 Subject: [PATCH 003/224] Refactoring previous commits --- .travis.yml | 49 ++++++------------- Dockerfile.server | 18 ++++--- Dockerfile.travis | 48 ++++++++++++++++++ Dockerfile.viewer | 18 +++---- Dockerfile.websocket_server | 12 +++-- .../roles/screenly/files/screenly-web.service | 15 ------ .../screenly-websocket_server_layer.service | 11 ----- ansible/roles/screenly/tasks/main.yml | 9 ++-- ansible/roles/system/tasks/main.yml | 27 ++++++++++ bin/install.sh | 12 +---- .../system/files => configs}/10-evdev.conf | 0 .../files => configs}/10-serverflags.conf | 0 requirements.host.txt | 4 ++ requirements.server.txt | 4 +- requirements.txt | 7 ++- requirements.viewer.txt | 8 +-- requirements.websocket_server.txt | 3 -- tests/updates_test.py | 3 +- tests/viewer_test.py | 47 +----------------- viewer.py | 4 +- 20 files changed, 143 insertions(+), 156 deletions(-) create mode 100644 Dockerfile.travis delete mode 100644 ansible/roles/screenly/files/screenly-web.service delete mode 100644 ansible/roles/screenly/files/screenly-websocket_server_layer.service rename {ansible/roles/system/files => configs}/10-evdev.conf (100%) rename {ansible/roles/system/files => configs}/10-serverflags.conf (100%) create mode 100644 requirements.host.txt diff --git a/.travis.yml b/.travis.yml index 6fd44d345..31f0ebe26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,43 +1,26 @@ language: python python: - "2.7" -addons: - firefox: "45.0" - apt: - packages: - - net-tools - - mplayer - - python-setuptools -before_install: - - sudo add-apt-repository ppa:mc3man/trusty-media -y - - sudo apt-get update -q - - sudo apt-get install ffmpeg python-gi python-dev + +services: + - docker + install: - - pip install -U pip - - pip install ansible==2.5.2 - - pip install -r requirements.viewer.txt - - pip install -r requirements.server.txt - - pip install -r requirements.dev.txt + - docker build . -f Dockerfile.travis -t screenly/travis-ci + - docker run --name travis-ci -v $TRAVIS_BUILD_DIR:/root/screenly -td screenly/travis-ci /bin/bash + before_script: - - mkdir -p ~/.screenly ~/screenly_assets - - cp ansible/roles/screenly/files/screenly.conf ~/.screenly/ - - cp ansible/roles/screenly/files/screenly.db ~/.screenly/ - - cp ansible/roles/screenly/files/screenly_utils.sh /tmp/screenly_utils.sh - - echo -e "[local]\nlocalhost ansible_connection=local" > ansible/localhost - - curl https://www.screenly.io/upload/ose-logo.png > /tmp/image.png - - curl https://www.screenly.io/upload/ose-logo.png > ~/screenly_assets/image.tmp - - curl https://www.screenly.io/upload/big_buck_bunny_720p_10mb.flv > /tmp/video.flv - - export DISPLAY=:99.0 - - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 - - python tests/rtmplite/rtmp.py -r /tmp/ & + - docker exec travis-ci bash -c "echo -e '[local]\nlocalhost ansible_connection=local' > ansible/localhost" + - docker exec travis-ci bash -c "python tests/rtmplite/rtmp.py -r /tmp/" & + - sleep 3 + - docker exec travis-ci bash -c "python server.py" & + - sleep 3 + - docker exec travis-ci bash -c "Xvfb :99 -ac" & - sleep 3 - - python server.py & - - sleep 3 # give xvfb some time to start - script: - - find . ! -path "*/rtmplite/*" -name \*.py -exec pep8 --ignore=E402,E501,E731 {} + - - nosetests -v -a '!fixme' --with-isolation - - ansible-playbook --syntax-check -i ansible/localhost ansible/site.yml + - docker exec -ti travis-ci bash -c "find . ! -path '*/rtmplite/*' -name \*.py -exec pep8 --ignore=E402,E501,E731 {} +" + - docker exec -ti travis-ci bash -c "nosetests -v -a '!fixme' --with-isolation" + - docker exec -ti travis-ci bash -c "ansible-playbook --syntax-check -i ansible/localhost ansible/site.yml" - python -m SimpleHTTPServer 8080 & - sleep 3 - bash static/spec/runner.sh diff --git a/Dockerfile.server b/Dockerfile.server index 85fdd6d04..6260e9d88 100644 --- a/Dockerfile.server +++ b/Dockerfile.server @@ -7,23 +7,27 @@ RUN apt-get update && \ curl \ git-core \ libffi-dev \ + libraspberrypi0 \ libssl-dev \ net-tools \ + omxplayer \ python-dev \ python-netifaces \ + python-pip \ sqlite3 && \ apt-get clean +RUN pip install --upgrade pip + # Install Python requirements -ADD requirements.server.txt /tmp/requirements.txt -RUN curl -s https://bootstrap.pypa.io/get-pip.py | python && \ - pip install -r /tmp/requirements.txt +ADD requirements.txt /tmp/requirements.txt +ADD requirements.server.txt /tmp/requirements.server.txt +RUN pip install -r /tmp/requirements.txt +RUN pip install -r /tmp/requirements.server.txt # Create runtime user -RUN useradd pi - -RUN mkdir -p /home/pi/.screenly /home/pi/screenly /home/pi/screenly_assets -RUN chown -R pi:pi /home/pi +RUN useradd pi -d /home/pi \ + && /usr/sbin/usermod -a -G video pi USER pi diff --git a/Dockerfile.travis b/Dockerfile.travis new file mode 100644 index 000000000..57a290d55 --- /dev/null +++ b/Dockerfile.travis @@ -0,0 +1,48 @@ +FROM ubuntu:16.04 +MAINTAINER Anton Molodykh + +RUN apt-get update && \ + apt-get -y install \ + build-essential \ + curl \ + ffmpeg \ + git-core \ + libdbus-glib-1-dev \ + libgtk2.0-0 \ + mplayer \ + net-tools \ + psmisc \ + python-dev \ + python-pip \ + software-properties-common \ + sqlite3 \ + xvfb && \ + apt-get clean + +RUN curl https://ftp.mozilla.org/pub/firefox/releases/45.0/linux-x86_64/en-US/firefox-45.0.tar.bz2 > /tmp/firefox.tar.bz2 +RUN tar -xjf /tmp/firefox.tar.bz2 -C /tmp +RUN ln -s /tmp/firefox/firefox /usr/bin/firefox + +ENV DISPLAY=:99 + +RUN pip install --upgrade pip +ADD requirements.txt /tmp/requirements.txt +ADD requirements.viewer.txt /tmp/requirements.viewer.txt +ADD requirements.server.txt /tmp/requirements.server.txt +ADD requirements.dev.txt /tmp/requirements.dev.txt + +RUN pip install ansible==2.5.3 \ + -r /tmp/requirements.txt \ + -r /tmp/requirements.viewer.txt \ + -r /tmp/requirements.server.txt \ + -r /tmp/requirements.dev.txt + +RUN mkdir -p ~/.screenly ~/screenly_assets +ADD ansible/roles/screenly/files/screenly.conf /root/.screenly/ +ADD ansible/roles/screenly/files/screenly.db /root/.screenly/ +ADD ansible/roles/screenly/files/screenly_utils.sh /tmp/screenly_utils.sh +RUN curl https://www.screenly.io/upload/ose-logo.png > /tmp/image.png +RUN curl https://www.screenly.io/upload/ose-logo.png > ~/screenly_assets/image.tmp +RUN curl https://www.screenly.io/upload/big_buck_bunny_720p_10mb.flv > /tmp/video.flv + +WORKDIR /root/screenly diff --git a/Dockerfile.viewer b/Dockerfile.viewer index b4671afbc..ebf0d91d9 100644 --- a/Dockerfile.viewer +++ b/Dockerfile.viewer @@ -17,25 +17,25 @@ RUN apt-get update && \ omxplayer \ psmisc \ python-dev \ - python-gi \ python-netifaces \ + python-pip \ sqlite3 \ x11-utils \ x11-xserver-utils \ xserver-xorg && \ apt-get clean +RUN pip install --upgrade pip + # Install Python requirements -ADD requirements.viewer.txt /tmp/requirements.txt -RUN curl -s https://bootstrap.pypa.io/get-pip.py | python && \ - pip install -r /tmp/requirements.txt +ADD requirements.txt /tmp/requirements.txt +ADD requirements.viewer.txt /tmp/requirements.viewer.txt +RUN pip install -r /tmp/requirements.txt +RUN pip install -r /tmp/requirements.viewer.txt # Create runtime user RUN useradd pi -d /home/pi \ && /usr/sbin/usermod -a -G video pi -RUN mkdir -p /home/pi/.screenly /home/pi/screenly /home/pi/screenly_assets - -RUN chown -R pi:pi /home/pi RUN mkdir /usr/local/share/ScreenlyWebview @@ -49,8 +49,8 @@ RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview ENV NOREFRESH 1 # Copy X11 configs -COPY ansible/roles/system/files/10-serverflags.conf /usr/share/X11/xorg.conf.d/10-serverflags.conf -COPY ansible/roles/system/files/10-evdev.conf /usr/share/X11/xorg.conf.d/10-evdev.conf +COPY configs/10-serverflags.conf /usr/share/X11/xorg.conf.d/10-serverflags.conf +COPY configs/10-evdev.conf /usr/share/X11/xorg.conf.d/10-evdev.conf WORKDIR /home/pi/screenly diff --git a/Dockerfile.websocket_server b/Dockerfile.websocket_server index 4eed4c082..f1b1881b2 100644 --- a/Dockerfile.websocket_server +++ b/Dockerfile.websocket_server @@ -6,13 +6,17 @@ RUN apt-get update && \ build-essential \ curl \ libffi-dev \ - python-dev && \ + python-dev \ + python-pip && \ apt-get clean +RUN pip install --upgrade pip + # Install Python requirements -ADD requirements.websocket_server.txt /tmp/requirements.txt -RUN curl -s https://bootstrap.pypa.io/get-pip.py | python && \ - pip install -r /tmp/requirements.txt +ADD requirements.txt /tmp/requirements.txt +ADD requirements.websocket_server.txt /tmp/requirements.websocket_server.txt +RUN pip install -r /tmp/requirements.txt +RUN pip install -r /tmp/requirements.websocket_server.txt # Create runtime user RUN useradd pi diff --git a/ansible/roles/screenly/files/screenly-web.service b/ansible/roles/screenly/files/screenly-web.service deleted file mode 100644 index 15051195c..000000000 --- a/ansible/roles/screenly/files/screenly-web.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Screenly Web UI -After=network-online.target - -[Service] -WorkingDirectory=/home/pi/screenly -User=pi -ExecStartPre=/usr/bin/python /home/pi/screenly/bin/wait.py -ExecStart=/usr/bin/python /home/pi/screenly/server.py -Restart=always -RestartSec=5 -Environment=PYTHONPATH=/home/pi/screenly - -[Install] -WantedBy=multi-user.target diff --git a/ansible/roles/screenly/files/screenly-websocket_server_layer.service b/ansible/roles/screenly/files/screenly-websocket_server_layer.service deleted file mode 100644 index e196768c0..000000000 --- a/ansible/roles/screenly/files/screenly-websocket_server_layer.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Websocket Server layer - -[Service] -WorkingDirectory=/home/pi/screenly -User=pi -ExecStart=/usr/bin/python /home/pi/screenly/websocket_server_layer.py -Restart=always - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index 586dafe21..ac026c47a 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -23,7 +23,7 @@ dest: /home/pi/.screenly/screenly.conf - name: Install pip dependencies - pip: requirements=/home/pi/screenly/requirements.txt + pip: requirements=/home/pi/screenly/requirements.host.txt - name: Create default assets database if does not exists copy: @@ -66,16 +66,16 @@ - name: Check if deprecated systemd services exists stat: path: /etc/systemd/system/X.service - register: X_service + register: x_service -- set_fact: X_service_exist="{{X_service.stat.exists}}" +- set_fact: x_service_exist="{{x_service.stat.exists}}" - name: Disable deprecated systemd services systemd: name: "{{ item }}" enabled: no with_items: "{{ screenly_systemd_units }}" - when: X_service_exist + when: x_service_exist - name: Remove deprecated systemd units file: @@ -92,6 +92,7 @@ recreate: true restart_policy: unless-stopped network_mode: host + privileged: yes volumes: - /home/pi/screenly:/home/pi/screenly - /home/pi/.screenly:/home/pi/.screenly diff --git a/ansible/roles/system/tasks/main.yml b/ansible/roles/system/tasks/main.yml index 77ebf0667..686ee2862 100644 --- a/ansible/roles/system/tasks/main.yml +++ b/ansible/roles/system/tasks/main.yml @@ -171,6 +171,33 @@ - x11-xserver-utils - xserver-xorg +- name: Add docker apt key + apt_key: + url: https://download.docker.com/linux/raspbian/gpg + state: present + +- name : Get raspbian name + command: lsb_release -cs + register: raspbian_name + +- name: Add Docker repo + lineinfile: + path: /etc/apt/sources.list.d/docker.list + create: yes + line: "deb [arch=armhf] https://download.docker.com/linux/raspbian {{ raspbian_name.stdout }} edge" + state: present + +- name: Install Docker + apt: + name: docker-ce + update_cache: yes + install_recommends: no + +- name: Add pi to docker group + user: + name: pi + group: docker + - name: Perform system upgrade apt: upgrade: dist diff --git a/bin/install.sh b/bin/install.sh index 60b67cd9b..d61ff8464 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -66,17 +66,7 @@ sudo apt-get purge -y python-setuptools python-pip python-pyasn1 sudo apt-get install -y python-dev git-core libffi-dev libssl-dev curl -s https://bootstrap.pypa.io/get-pip.py | sudo python -docker -v > /dev/null -if [ "$?" != '0' ]; then - sudo apt-get install -y apt-transport-https ca-certificates curl - curl -fsSL "https://download.docker.com/linux/raspbian/gpg" | sudo apt-key add -qq - >/dev/null - echo "deb [arch=armhf] https://download.docker.com/linux/raspbian stretch edge" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - sudo apt-get update - sudo apt-get install -y --no-install-recommends docker-ce - sudo usermod -aG docker pi -fi - -sudo pip install ansible==2.5.2 +sudo pip install ansible==2.5.3 ansible localhost -m git -a "repo=${1:-https://github.com/screenly/screenly-ose.git} dest=/home/pi/screenly version=$BRANCH" cd /home/pi/screenly/ansible diff --git a/ansible/roles/system/files/10-evdev.conf b/configs/10-evdev.conf similarity index 100% rename from ansible/roles/system/files/10-evdev.conf rename to configs/10-evdev.conf diff --git a/ansible/roles/system/files/10-serverflags.conf b/configs/10-serverflags.conf similarity index 100% rename from ansible/roles/system/files/10-serverflags.conf rename to configs/10-serverflags.conf diff --git a/requirements.host.txt b/requirements.host.txt new file mode 100644 index 000000000..970d6ad48 --- /dev/null +++ b/requirements.host.txt @@ -0,0 +1,4 @@ +docker-py==1.10.6 +netifaces==0.10.4 +pwgen==0.8.2.post0 +sh==1.08 diff --git a/requirements.server.txt b/requirements.server.txt index 343a0743f..262d5257b 100644 --- a/requirements.server.txt +++ b/requirements.server.txt @@ -1,13 +1,13 @@ certifi==2018.4.16 -configparser==3.5.0 +cryptography==2.2.2 Flask-Cors==3.0.4 flask-restful-swagger-2==0.35 flask-swagger-ui==3.0.12 -flask==0.12.2 flask_restful==0.3.6 futures==3.0.5 gunicorn==19.8.1 hurry.filesize==0.9 +idna==2.6 netifaces==0.10.4 pyasn1==0.1.8 python-dateutil==2.4.2 diff --git a/requirements.txt b/requirements.txt index 970d6ad48..707082ef7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -docker-py==1.10.6 -netifaces==0.10.4 -pwgen==0.8.2.post0 -sh==1.08 +configparser==3.5.0 +flask==0.12.2 +pyzmq==16.0.2 diff --git a/requirements.viewer.txt b/requirements.viewer.txt index 1b065e278..a88c24c82 100644 --- a/requirements.viewer.txt +++ b/requirements.viewer.txt @@ -1,11 +1,11 @@ certifi==2018.4.16 -configparser==3.5.0 -flask==0.12.2 +cryptography==2.2.2 +dbus-python==1.2.8 +idna==2.6 mixpanel==4.3.2 netifaces==0.10.4 python-dateutil==2.4.2 pytz==2012d pyzmq==16.0.2 -pydbus==0.6.0 requests[security]==2.18.4 -sh==1.08 \ No newline at end of file +sh==1.08 diff --git a/requirements.websocket_server.txt b/requirements.websocket_server.txt index a5ef325d5..58472df53 100644 --- a/requirements.websocket_server.txt +++ b/requirements.websocket_server.txt @@ -1,7 +1,4 @@ -configparser==3.5.0 -flask==0.12.2 gevent-websocket==0.10.1 gevent==1.2.2 pyasn1==0.1.8 -pyzmq==16.0.2 six==1.11.0 diff --git a/tests/updates_test.py b/tests/updates_test.py index db91e3bf4..73d87753b 100644 --- a/tests/updates_test.py +++ b/tests/updates_test.py @@ -48,10 +48,9 @@ def test_if_sha_file_is_new__check_update__should_return_false(self): with open(self.sha_file, 'r') as f: self.assertEqual(f.readline(), fancy_sha) - @patch('viewer.req_get', side_effect=mocked_req_get) @patch('viewer.remote_branch_available', side_effect=lambda _: True) @patch('viewer.fetch_remote_hash', side_effect=lambda _: 'master') - def test_if_sha_file_is_empty__check_update__should_return_true(self, req_get, remote_branch_available, fetch_remote_hash): + def test_if_sha_file_is_empty__check_update__should_return_true(self, remote_branch_available, fetch_remote_hash): with open(self.sha_file, 'w+') as f: pass diff --git a/tests/viewer_test.py b/tests/viewer_test.py index 7df3638d1..b11a800e9 100644 --- a/tests/viewer_test.py +++ b/tests/viewer_test.py @@ -43,59 +43,16 @@ def tearDown(self): self.u.SPLASH_DELAY = self.original_splash_delay -@attr('fixme') -class TestEmptyPl(ViewerTestCase): - def test_empty(self): - m_asset_list = mock.Mock() - m_asset_list.return_value = ([], None) - with mock.patch.object(self.u, 'generate_asset_list', m_asset_list): - self.u.main() - - -class TestBrowserSend(ViewerTestCase): - def test_send(self): - self.p_cmd.start() - self.p_send.start() - self.u.setup() - self.u.load_browser() - self.p_send.stop() - self.p_cmd.stop() - - m_put = mock.Mock(name='uzbl_put') - self.m_cmd.return_value.return_value.process.stdin.put = m_put - - self.u.browser_send('test_cmd') - m_put.assert_called_once_with('test_cmd\n') - - def test_dead(self): - self.p_loadb.start() - self.u.browser_send(None) - self.m_loadb.assert_called_once() - self.p_loadb.stop() - - -class TestBrowserClear(ViewerTestCase): - def test_clear(self): - with mock.patch.object(self.u, 'browser_url', mock.Mock()) as m_url: - self.u.setup() - self.u.browser_clear() - m_url.assert_called_once() - - class TestLoadBrowser(ViewerTestCase): - def test_setup(self): - self.u.setup() - ok_(os.path.isdir(self.u.SCREENLY_HTML)) - def load_browser(self): - m_uzbl = mock.Mock(name='uzbl') + m_uzbl = mock.Mock(name='ScreenlyWebview') self.m_cmd.return_value = m_uzbl self.p_cmd.start() self.p_send.start() self.u.load_browser() self.p_send.stop() self.p_cmd.stop() - self.m_cmd.assert_called_once_with('uzbl-browser') + self.m_cmd.assert_called_once_with('ScreenlyWebview') m_uzbl.assert_called_once_with(print_events=True, config='-', uri=None, _bg=True) m_send.assert_called_once() diff --git a/viewer.py b/viewer.py index 9b0f1e0d5..282c884c5 100755 --- a/viewer.py +++ b/viewer.py @@ -7,12 +7,12 @@ from random import shuffle from threading import Thread +from dbus import SessionBus from mixpanel import Mixpanel, MixpanelException from netifaces import gateways from signal import signal, SIGUSR1 from time import sleep import logging -from pydbus import SessionBus import random import sh import string @@ -386,7 +386,7 @@ def setup(): load_browser() bus = SessionBus() - browser_bus = bus.get('screenly.webview', '/Screenly') + browser_bus = bus.get_object('screenly.webview', '/Screenly') def main(): From d7e820217e8af6a7fd20ce9338fb810be7b87f7f Mon Sep 17 00:00:00 2001 From: amolodykh Date: Tue, 29 May 2018 13:24:39 +0600 Subject: [PATCH 004/224] Removes X11 --- Dockerfile.viewer | 37 +++++++++++++++++--------- ansible/roles/system/tasks/main.yml | 24 +++++++++++++++++ bin/start_viewer.sh | 14 +--------- configs/10-evdev.conf | 40 ----------------------------- configs/10-serverflags.conf | 6 ----- viewer.py | 9 +++---- 6 files changed, 54 insertions(+), 76 deletions(-) delete mode 100644 configs/10-evdev.conf delete mode 100644 configs/10-serverflags.conf diff --git a/Dockerfile.viewer b/Dockerfile.viewer index ebf0d91d9..a7ffb238e 100644 --- a/Dockerfile.viewer +++ b/Dockerfile.viewer @@ -12,17 +12,14 @@ RUN apt-get update && \ libqt5webkit5 \ libraspberrypi0 \ libssl-dev \ - matchbox \ + libts-dev \ net-tools \ omxplayer \ psmisc \ python-dev \ python-netifaces \ python-pip \ - sqlite3 \ - x11-utils \ - x11-xserver-utils \ - xserver-xorg && \ + sqlite3 && \ apt-get clean RUN pip install --upgrade pip @@ -33,12 +30,28 @@ ADD requirements.viewer.txt /tmp/requirements.viewer.txt RUN pip install -r /tmp/requirements.txt RUN pip install -r /tmp/requirements.viewer.txt -# Create runtime user -RUN useradd pi -d /home/pi \ - && /usr/sbin/usermod -a -G video pi +# QtBase from packages does not support eglfs +RUN wget -P /tmp https://github.com/antonmolodykh/Screenly-WebVew/releases/download/0.1/qtbase.tar.gz +RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local +RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf +RUN ldconfig -RUN mkdir /usr/local/share/ScreenlyWebview +# Fix symlinks +RUN rm /usr/lib/arm-linux-gnueabihf/libEGL.so.1 +RUN rm /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1 +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 + +RUN rm /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 +RUN rm /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 +ENV QT_QPA_PLATFORM eglfs + +RUN mkdir /usr/local/share/ScreenlyWebview RUN wget -P /tmp https://github.com/antonmolodykh/Screenly-WebVew/releases/download/0.1/screenly-webview-v0.1.tar.gz RUN tar -xzf /tmp/screenly-webview-v0.1.tar.gz -C /tmp @@ -48,9 +61,9 @@ RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview # Fix white flickering in omxplayer ENV NOREFRESH 1 -# Copy X11 configs -COPY configs/10-serverflags.conf /usr/share/X11/xorg.conf.d/10-serverflags.conf -COPY configs/10-evdev.conf /usr/share/X11/xorg.conf.d/10-evdev.conf +# Create runtime user +RUN useradd pi -d /home/pi \ + && /usr/sbin/usermod -a -G video pi WORKDIR /home/pi/screenly diff --git a/ansible/roles/system/tasks/main.yml b/ansible/roles/system/tasks/main.yml index 686ee2862..46f93f1eb 100644 --- a/ansible/roles/system/tasks/main.yml +++ b/ansible/roles/system/tasks/main.yml @@ -44,6 +44,30 @@ tags: - touches_boot_partition +- name: Add gpu_mem_256 in config.txt if it doesn't exist + lineinfile: + path: /boot/config.txt + line: gpu_mem_256=96 + when: config_txt.stdout.find('gpu_mem_256') == -1 + tags: + - touches_boot_partition + +- name: Add gpu_mem_512 in config.txt if it doesn't exist + lineinfile: + path: /boot/config.txt + line: gpu_mem_512=128 + when: config_txt.stdout.find('gpu_mem_512') == -1 + tags: + - touches_boot_partition + +- name: Add gpu_mem_1024 in config.txt if it doesn't exist + lineinfile: + path: /boot/config.txt + line: gpu_mem_1024=196 + when: config_txt.stdout.find('gpu_mem_1024') == -1 + tags: + - touches_boot_partition + - name: Backup kernel boot args copy: src: /boot/cmdline.txt diff --git a/bin/start_viewer.sh b/bin/start_viewer.sh index 28dd5b83e..94b2d0706 100644 --- a/bin/start_viewer.sh +++ b/bin/start_viewer.sh @@ -4,19 +4,7 @@ # Prevent it so that the container does not fall trap '' 16 -# Start X -rm -f /tmp/.X0-lock -/usr/bin/X & -export DISPLAY=:0.0 - -# Waiting for X11 -while ! xdpyinfo >/dev/null 2>&1; do - sleep 0.5 -done - -su - pi -c " /usr/bin/matchbox-window-manager -use_titlebar no -use_cursor no &" - -su - pi -c "cd /home/pi/screenly && dbus-run-session python viewer.py &" +su - pi -c "cd /home/pi/screenly && QT_QPA_EGLFS_FORCE888=1 dbus-run-session python viewer.py &" # Waiting for the viewer while true; do diff --git a/configs/10-evdev.conf b/configs/10-evdev.conf deleted file mode 100644 index ba37ec34d..000000000 --- a/configs/10-evdev.conf +++ /dev/null @@ -1,40 +0,0 @@ -# -# Catch-all evdev loader for udev-based systems -# We don't simply match on any device since that also adds accelerometers -# and other devices that we don't really want to use. The list below -# matches everything but joysticks. - -#Section "InputClass" -# Identifier "evdev pointer catchall" -# MatchIsPointer "on" -# MatchDevicePath "/dev/input/event*" -# Driver "evdev" -#EndSection - -Section "InputClass" - Identifier "evdev keyboard catchall" - MatchIsKeyboard "on" - MatchDevicePath "/dev/input/event*" - Driver "evdev" -EndSection - -#Section "InputClass" -# Identifier "evdev touchpad catchall" -# MatchIsTouchpad "on" -# MatchDevicePath "/dev/input/event*" -# Driver "evdev" -#EndSection - -#Section "InputClass" -# Identifier "evdev tablet catchall" -# MatchIsTablet "on" -# MatchDevicePath "/dev/input/event*" -# Driver "evdev" -#EndSection - -#Section "InputClass" -# Identifier "evdev touchscreen catchall" -# MatchIsTouchscreen "on" -# MatchDevicePath "/dev/input/event*" -# Driver "evdev" -#EndSection diff --git a/configs/10-serverflags.conf b/configs/10-serverflags.conf deleted file mode 100644 index c7c69374a..000000000 --- a/configs/10-serverflags.conf +++ /dev/null @@ -1,6 +0,0 @@ -Section "ServerFlags" - Option "BlankTime" "0" - Option "StandbyTime" "0" - Option "SuspendTime" "0" - Option "OffTime" "0" -EndSection diff --git a/viewer.py b/viewer.py index 282c884c5..3d1063900 100755 --- a/viewer.py +++ b/viewer.py @@ -250,7 +250,7 @@ def view_video(uri, duration): if arch in ('armv6l', 'armv7l'): player_args = ['omxplayer', uri] - player_kwargs = {'o': settings['audio_output'], '_bg': True, '_ok_code': [0, 124, 143]} + player_kwargs = {'o': settings['audio_output'], 'layer': 1, '_bg': True, '_ok_code': [0, 124, 143]} else: player_args = ['mplayer', uri, '-nosound'] player_kwargs = {'_bg': True, '_ok_code': [0, 124]} @@ -260,7 +260,7 @@ def view_video(uri, duration): run = sh.Command(player_args[0])(*player_args[1:], **player_kwargs) - browser_bus.loadImage('null') + view_image('null') try: while run.process.alive: watchdog() @@ -399,10 +399,9 @@ def main(): while not path.isfile(HOME + INITIALIZED_FILE): sleep(1) - url = 'http://{0}:{1}/splash_page'.format(LISTEN, PORT) if settings['show_splash'] else 'file://' + BLACK_PAGE - view_webpage(url) - if settings['show_splash']: + url = 'http://{0}:{1}/splash_page'.format(LISTEN, PORT) + view_webpage(url) sleep(SPLASH_DELAY) global scheduler From 9ca653a894ae64023279b3a06f2c36d600d0ae9c Mon Sep 17 00:00:00 2001 From: amolodykh Date: Mon, 4 Jun 2018 18:55:51 +0600 Subject: [PATCH 005/224] Use resin images and Install from experemental branch --- Dockerfile.server | 3 ++- Dockerfile.viewer | 7 ++++--- Dockerfile.websocket_server | 5 +++-- ansible/roles/screenly/tasks/main.yml | 15 +++++++++------ bin/install.sh | 17 +++++++++++++---- 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/Dockerfile.server b/Dockerfile.server index 6260e9d88..b8e350505 100644 --- a/Dockerfile.server +++ b/Dockerfile.server @@ -1,4 +1,4 @@ -FROM raspbian/stretch +FROM resin/rpi-raspbian:stretch MAINTAINER Anton Molodykh RUN apt-get update && \ @@ -14,6 +14,7 @@ RUN apt-get update && \ python-dev \ python-netifaces \ python-pip \ + python-setuptools \ sqlite3 && \ apt-get clean diff --git a/Dockerfile.viewer b/Dockerfile.viewer index a7ffb238e..848406c9b 100644 --- a/Dockerfile.viewer +++ b/Dockerfile.viewer @@ -1,4 +1,4 @@ -FROM raspbian/stretch +FROM resin/rpi-raspbian:stretch MAINTAINER Anton Molodykh RUN apt-get update && \ @@ -19,6 +19,7 @@ RUN apt-get update && \ python-dev \ python-netifaces \ python-pip \ + python-setuptools \ sqlite3 && \ apt-get clean @@ -31,7 +32,7 @@ RUN pip install -r /tmp/requirements.txt RUN pip install -r /tmp/requirements.viewer.txt # QtBase from packages does not support eglfs -RUN wget -P /tmp https://github.com/antonmolodykh/Screenly-WebVew/releases/download/0.1/qtbase.tar.gz +RUN curl -L https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase.tar.gz > /tmp/qtbase.tar.gz RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf RUN ldconfig @@ -52,7 +53,7 @@ RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so ENV QT_QPA_PLATFORM eglfs RUN mkdir /usr/local/share/ScreenlyWebview -RUN wget -P /tmp https://github.com/antonmolodykh/Screenly-WebVew/releases/download/0.1/screenly-webview-v0.1.tar.gz +RUN curl -L https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/screenly-webview-v0.1.tar.gz > /tmp/screenly-webview-v0.1.tar.gz RUN tar -xzf /tmp/screenly-webview-v0.1.tar.gz -C /tmp RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res diff --git a/Dockerfile.websocket_server b/Dockerfile.websocket_server index f1b1881b2..67106485b 100644 --- a/Dockerfile.websocket_server +++ b/Dockerfile.websocket_server @@ -1,4 +1,4 @@ -FROM raspbian/stretch +FROM resin/rpi-raspbian:stretch MAINTAINER Anton Molodykh RUN apt-get update && \ @@ -7,7 +7,8 @@ RUN apt-get update && \ curl \ libffi-dev \ python-dev \ - python-pip && \ + python-pip \ + python-setuptools && \ apt-get clean RUN pip install --upgrade pip diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index ac026c47a..6687bd7e1 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -83,10 +83,13 @@ state: absent with_items: "{{ screenly_systemd_units }}" +- debug: + msg: "Use {{ lookup('env', 'DOCKER_TAG') }} version of images." + - name: Create screenly-server container docker_container: - name: screenly-server - image: amolodykh/screenly-server + name: screenly-ose-server + image: "screenly/screenly-ose-server:{{ lookup('env', 'DOCKER_TAG') }}" pull: true state: present recreate: true @@ -100,8 +103,8 @@ - name: Create screenly-viewer container docker_container: - name: screenly-viewer - image: amolodykh/screenly-viewer + name: screenly-ose-viewer + image: "screenly/screenly-ose-viewer:{{ lookup('env', 'DOCKER_TAG') }}" pull: true state: present recreate: true @@ -115,8 +118,8 @@ - name: Create screenly-websocket-server container docker_container: - name: screenly-websocket-server - image: amolodykh/screenly-websocket-server + name: screenly-ose-websocket + image: "screenly/screenly-ose-websocket:{{ lookup('env', 'DOCKER_TAG') }}" pull: true state: present recreate: true diff --git a/bin/install.sh b/bin/install.sh index d61ff8464..7f75bb678 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -35,13 +35,22 @@ if [ "$?" = "1" ]; then exit 1 fi -echo && read -p "Would you like to use the development branch? You will get the latest features, but things may break. (y/N)" -n 1 -r -s DEV && echo -if [ "$DEV" != 'y' ]; then - BRANCH="production" +echo && read -p "Would you like to use the experimental branch? It contains the last major changes, such as the new browser and migrating to the docker (y/N)" -n 1 -r -s EXP && echo +if [ "$EXP" != 'y' ]; then + echo && read -p "Would you like to use the development branch? You will get the latest features, but things may break. (y/N)" -n 1 -r -s DEV && echo + if [ "$DEV" != 'y' ]; then + export DOCKER_TAG="production" + BRANCH="production" + else + export DOCKER_TAG="latest" + BRANCH="master" + fi else - BRANCH="master" + export DOCKER_TAG="experimental" + BRANCH="experimental" fi + echo && read -p "Would you like to perform a full system upgrade as well? (y/N)" -n 1 -r -s UPGRADE && echo if [ "$UPGRADE" != 'y' ]; then EXTRA_ARGS="--skip-tags enable-ssl,system-upgrade" From 3d34bf013bbe2171c5cae5df0a686f550aed3cc0 Mon Sep 17 00:00:00 2001 From: amolodykh Date: Fri, 22 Jun 2018 15:59:46 +0600 Subject: [PATCH 006/224] Fixes display freezing --- viewer.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/viewer.py b/viewer.py index 3d1063900..fb3e5c501 100755 --- a/viewer.py +++ b/viewer.py @@ -411,6 +411,9 @@ def main(): subscriber.daemon = True subscriber.start() + # We don't want to show splash_page if there are active assets but all of them are not available + view_image(HOME + LOAD_SCREEN) + logging.debug('Entering infinite loop.') while True: asset_loop(scheduler) From 10ef51299f8274a943f1ce3b781f67a7757d1df6 Mon Sep 17 00:00:00 2001 From: amolodykh Date: Fri, 13 Jul 2018 17:20:10 +0600 Subject: [PATCH 007/224] Separate viewer image for each type of device --- Dockerfile.viewer | 9 +++++++-- ansible/roles/screenly/tasks/main.yml | 15 +++++++++++---- ansible/site.yml | 2 ++ bin/install.sh | 8 ++++++++ 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Dockerfile.viewer b/Dockerfile.viewer index 848406c9b..80ead4859 100644 --- a/Dockerfile.viewer +++ b/Dockerfile.viewer @@ -32,7 +32,10 @@ RUN pip install -r /tmp/requirements.txt RUN pip install -r /tmp/requirements.viewer.txt # QtBase from packages does not support eglfs -RUN curl -L https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase.tar.gz > /tmp/qtbase.tar.gz +ARG PI_VERSION=pi1 +RUN curl -L \ + "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ + > /tmp/qtbase.tar.gz RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf RUN ldconfig @@ -53,7 +56,9 @@ RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so ENV QT_QPA_PLATFORM eglfs RUN mkdir /usr/local/share/ScreenlyWebview -RUN curl -L https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/screenly-webview-v0.1.tar.gz > /tmp/screenly-webview-v0.1.tar.gz +RUN curl -L \ + "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/screenly-webview-v0.1.tar.gz" \ + > /tmp/screenly-webview-v0.1.tar.gz RUN tar -xzf /tmp/screenly-webview-v0.1.tar.gz -C /tmp RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index 6687bd7e1..a9bced1ae 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -83,13 +83,20 @@ state: absent with_items: "{{ screenly_systemd_units }}" +- name: Check /proc/device-tree/model file + command: cat /proc/device-tree/model + register: model_file + +- debug: + msg: "Device type: {{ device_type }}" + - debug: - msg: "Use {{ lookup('env', 'DOCKER_TAG') }} version of images." + msg: "Use {{ docker_tag }} version of images." - name: Create screenly-server container docker_container: name: screenly-ose-server - image: "screenly/screenly-ose-server:{{ lookup('env', 'DOCKER_TAG') }}" + image: "screenly/screenly-ose-server:{{ docker_tag }}" pull: true state: present recreate: true @@ -104,7 +111,7 @@ - name: Create screenly-viewer container docker_container: name: screenly-ose-viewer - image: "screenly/screenly-ose-viewer:{{ lookup('env', 'DOCKER_TAG') }}" + image: "screenly/screenly-ose-viewer:{{ docker_tag }}-{{ device_type }}" pull: true state: present recreate: true @@ -119,7 +126,7 @@ - name: Create screenly-websocket-server container docker_container: name: screenly-ose-websocket - image: "screenly/screenly-ose-websocket:{{ lookup('env', 'DOCKER_TAG') }}" + image: "screenly/screenly-ose-websocket:{{ docker_tag }}" pull: true state: present recreate: true diff --git a/ansible/site.yml b/ansible/site.yml index 7baa75e70..9ba04c450 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -4,6 +4,8 @@ become: yes vars: manage_network: "{{ lookup('env', 'MANAGE_NETWORK') }}" + docker_tag: "{{ lookup('env', 'DOCKER_TAG') }}" + device_type: "{{ lookup('env', 'DEVICE_TYPE') }}" handlers: - name: restart-nginx diff --git a/bin/install.sh b/bin/install.sh index 334b0c3f3..a7b59d074 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -64,6 +64,14 @@ else EXTRA_ARGS="--skip-tags enable-ssl" fi +if grep -qF "Raspberry Pi 3" /proc/device-tree/model; then + export DEVICE_TYPE="pi3" +elif grep -qF "Raspberry Pi 2" /proc/device-tree/model; then + export DEVICE_TYPE="pi2" +else + export DEVICE_TYPE="pi1" +fi + set -x sudo mkdir -p /etc/ansible echo -e "[local]\nlocalhost ansible_connection=local" | sudo tee /etc/ansible/hosts > /dev/null From d8d4ab720c19294895554d620a693582289ffeea Mon Sep 17 00:00:00 2001 From: amolodykh Date: Fri, 3 Aug 2018 12:07:28 +0600 Subject: [PATCH 008/224] Fixed: containers don't start after experimental update --- ansible/roles/screenly/tasks/main.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index a9bced1ae..a80bd9ec6 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -73,6 +73,7 @@ - name: Disable deprecated systemd services systemd: name: "{{ item }}" + state: stopped enabled: no with_items: "{{ screenly_systemd_units }}" when: x_service_exist @@ -98,7 +99,7 @@ name: screenly-ose-server image: "screenly/screenly-ose-server:{{ docker_tag }}" pull: true - state: present + state: started recreate: true restart_policy: unless-stopped network_mode: host @@ -113,7 +114,7 @@ name: screenly-ose-viewer image: "screenly/screenly-ose-viewer:{{ docker_tag }}-{{ device_type }}" pull: true - state: present + state: started recreate: true restart_policy: unless-stopped network_mode: host @@ -128,7 +129,7 @@ name: screenly-ose-websocket image: "screenly/screenly-ose-websocket:{{ docker_tag }}" pull: true - state: present + state: started recreate: true restart_policy: unless-stopped network_mode: host From 5b5396a5fa8a8a28fa0aa5dde670a0b773385317 Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Tue, 9 Oct 2018 14:02:08 +0600 Subject: [PATCH 009/224] add pause for viewer container in ansible-playbook --- ansible/roles/screenly/tasks/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index a80bd9ec6..3833a502f 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -124,6 +124,9 @@ - /home/pi/.screenly:/home/pi/.screenly - /home/pi/screenly_assets:/home/pi/screenly_assets +- name: Pause screenly-viewer container + command: docker pause screenly-ose-viewer + - name: Create screenly-websocket-server container docker_container: name: screenly-ose-websocket From ae6daed9ff59e043e1ddb5cd088afb6ca51d76e2 Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Wed, 10 Oct 2018 11:35:11 +0600 Subject: [PATCH 010/224] updateMimetype fixes --- static/js/screenly-ose.coffee | 4 ++-- static/js/screenly-ose.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/static/js/screenly-ose.coffee b/static/js/screenly-ose.coffee index cb3ebe0a4..41dc51daf 100644 --- a/static/js/screenly-ose.coffee +++ b/static/js/screenly-ose.coffee @@ -183,7 +183,7 @@ API.View.AddAssetView = class AddAssetView extends Backbone.View maxChunkSize: 5000000 #5 MB url: 'api/v1/file_asset' progressall: (e, data) => if data.loaded and data.total - (@$ '.progress .bar').css 'width', "#{data.loaded/data.total*100}%" + (@$ '.progress .bar').css 'width', "#{data.loaded / data.total * 100}%" add: (e, data) -> (that.$ '.status').hide() (that.$ '.progress').show() @@ -229,7 +229,7 @@ API.View.AddAssetView = class AddAssetView extends Backbone.View updateFileUploadMimetype: (filename) => @updateMimetype filename updateMimetype: (filename) => mt = get_mimetype filename - @$fv 'mimetype', mt if mt + @$fv 'mimetype', if mt then mt else new Asset().defaults()['mimetype'] @change_mimetype() change: (e) => diff --git a/static/js/screenly-ose.js b/static/js/screenly-ose.js index 900b35cf5..24866daa5 100644 --- a/static/js/screenly-ose.js +++ b/static/js/screenly-ose.js @@ -414,9 +414,7 @@ AddAssetView.prototype.updateMimetype = function(filename) { var mt; mt = get_mimetype(filename); - if (mt) { - this.$fv('mimetype', mt); - } + this.$fv('mimetype', mt ? mt : new Asset().defaults()['mimetype']); return this.change_mimetype(); }; @@ -1034,3 +1032,5 @@ })(Backbone.View); }).call(this); + +//# sourceMappingURL=screenly-ose.js.map From fea110d5600cdad6f22e5352cbf4eb7aefc20224 Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Fri, 19 Oct 2018 13:40:15 +0600 Subject: [PATCH 011/224] resin.io support --- Dockerfile.template | 78 +++++++++++++++++++++++++++------------------ bin/start_resin.sh | 75 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 115 insertions(+), 38 deletions(-) diff --git a/Dockerfile.template b/Dockerfile.template index 2b125eed5..07391bd7d 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -1,60 +1,77 @@ -FROM resin/%%RESIN_MACHINE_NAME%%-debian +FROM resin/%%RESIN_MACHINE_NAME%%-debian:stretch MAINTAINER Anton Molodykh RUN apt-get update && \ apt-get -y install \ build-essential \ curl \ + git \ git-core \ libffi-dev \ + libraspberrypi0 \ libssl-dev \ - matchbox \ net-tools \ nginx-light \ omxplayer \ - psmisc \ python-dev \ - python-imaging \ python-netifaces \ - python-simplejson \ + python-pip \ + python-setuptools \ sqlite3 \ - uzbl \ - x11-xserver-utils \ - xserver-xorg && \ + gstreamer0.10-plugins-good \ + libdbus-glib-1-dev \ + libqt5webkit5 \ + libts-dev \ + psmisc && \ apt-get clean -RUN rm /etc/nginx/sites-enabled/default +RUN rm -f /etc/nginx/sites-enabled/default COPY ansible/roles/ssl/files/nginx_resin.conf /etc/nginx/sites-enabled/screenly.conf +RUN pip install --upgrade pip setuptools + # Install Python requirements -ADD requirements.viewer.txt /tmp/requirements.viewer.txt +ADD requirements.txt /tmp/requirements.txt ADD requirements.server.txt /tmp/requirements.server.txt ADD requirements.websocket_server.txt /tmp/requirements.websocket_server.txt -RUN curl -s https://bootstrap.pypa.io/get-pip.py | python && \ - pip install --upgrade -r /tmp/requirements.viewer.txt && \ - pip install --upgrade -r /tmp/requirements.server.txt && \ - pip install --upgrade -r /tmp/requirements.websocket_server.txt +ADD requirements.viewer.txt /tmp/requirements.viewer.txt +RUN pip install -r /tmp/requirements.txt +RUN pip install -r /tmp/requirements.server.txt +RUN pip install -r /tmp/requirements.websocket_server.txt +RUN pip install -r /tmp/requirements.viewer.txt + +# QtBase from packages does not support eglfs +RUN curl -L \ + "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase.tar.gz" \ + > /tmp/qtbase.tar.gz +RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local +RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf +RUN ldconfig -# Screenly Websocker Server -COPY ansible/roles/screenly/files/screenly-websocket_server_layer.service /etc/systemd/system/screenly-websocket_server_layer.service -RUN sed -i '/\[Service\]/ a\Environment=HOME=/data' /etc/systemd/system/screenly-websocket_server_layer.service +# Fix symlinks +RUN rm /usr/lib/arm-linux-gnueabihf/libEGL.so.1 +RUN rm /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1 +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 -# Screenly Server -COPY ansible/roles/screenly/files/screenly-web.service /etc/systemd/system/screenly-web.service -RUN sed -i '/\[Service\]/ a\Environment=HOME=/data' /etc/systemd/system/screenly-web.service -RUN sed -i '/\[Service\]/ a\Environment=Environment=LISTEN=0.0.0.0' /etc/systemd/system/screenly-web.service -RUN sed -i '/\[Service\]/ a\Environment=Environment=SWAGGER_HOST=ose.demo.screenlyapp.com' /etc/systemd/system/screenly-web.service +RUN rm /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 +RUN rm /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 -# X11 -COPY ansible/roles/screenly/files/X.service /etc/systemd/system/X.service +RUN mkdir /usr/local/share/ScreenlyWebview +RUN curl -L \ + "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/screenly-webview-v0.1.tar.gz" \ + > /tmp/screenly-webview-v0.1.tar.gz +RUN tar -xzf /tmp/screenly-webview-v0.1.tar.gz -C /tmp -# Matchbox -COPY ansible/roles/screenly/files/matchbox.service /etc/systemd/system/matchbox.service +RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res +RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview -#Screenly Viewer -COPY ansible/roles/screenly/files/screenly-viewer.service /etc/systemd/system/screenly-viewer.service -RUN sed -i '/\[Service\]/ a\Environment=HOME=/data' /etc/systemd/system/screenly-viewer.service -RUN sed -i '/\[Service\]/ a\Environment=DISABLE_UPDATE_CHECK=True' /etc/systemd/system/screenly-viewer.service +# Fix white flickering in omxplayer +ENV NOREFRESH 1 # Enable container init system. ENV INITSYSTEM on @@ -65,7 +82,6 @@ RUN useradd pi -d /home/pi \ # Install config file and file structure RUN mkdir -p /home/pi/screenly -COPY ansible/roles/screenly/files/gtkrc-2.0 /home/pi/.gtkrc-2.0 # Copy in code base COPY . /home/pi/screenly diff --git a/bin/start_resin.sh b/bin/start_resin.sh index eb2b3397c..545cfd753 100755 --- a/bin/start_resin.sh +++ b/bin/start_resin.sh @@ -2,7 +2,6 @@ mkdir -p \ /data/.config \ - /data/.config/uzbl \ /data/.screenly \ /data/screenly \ /data/screenly_assets @@ -10,7 +9,6 @@ mkdir -p \ cp -n ansible/roles/screenly/files/screenly.conf /data/.screenly/screenly.conf cp -n ansible/roles/screenly/files/screenly.db /data/.screenly/screenly.db cp -n loading.png /data/screenly/loading.png -cp -n ansible/roles/screenly/files/uzbl-config /data/.config/uzbl/config-screenly if [ -n "${OVERWRITE_CONFIG}" ]; then echo "Requested to overwrite Screenly config file." @@ -26,13 +24,76 @@ if [ -n "${MANAGEMENT_USER+x}" ] && [ -n "${MANAGEMENT_PASSWORD+x}" ]; then sed -i -e "s/^user=.*/user=${MANAGEMENT_USER}/" -e "s/^password=.*/password=${MANAGEMENT_PASSWORD}/" /data/.screenly/screenly.conf fi -sed -i "/\[Service\]/ a\Environment=RESIN_UUID=${RESIN_DEVICE_UUID}" /etc/systemd/system/screenly-web.service +cat << EOF > /etc/systemd/system/screenly-server.service +[Unit] +Description=Screenly Web UI +After=network-online.target -systemctl start X.service -systemctl start matchbox.service +[Service] +WorkingDirectory=/home/pi/screenly +User=pi + +Environment=HOME=/data +Environment=PYTHONPATH=/home/pi/screenly +Environment=LISTEN=0.0.0.0 +Environment=SWAGGER_HOST=ose.demo.screenlyapp.com +Environment=RESIN_UUID=${RESIN_DEVICE_UUID} + +ExecStartPre=/usr/bin/python /home/pi/screenly/bin/wait.py +ExecStart=/usr/bin/python /home/pi/screenly/server.py +Restart=always +RestartSec=5 + +[Install] +WantedBy=multi-user.target +EOF + +cat << EOF > /etc/systemd/system/screenly-viewer.service +[Unit] +Description=Screenly Viewer +After=screenly-server.service + +[Service] +WorkingDirectory=/home/pi/screenly +User=pi + +Environment=HOME=/data +Environment=QT_QPA_EGLFS_FORCE888=1 +Environment=QT_QPA_EGLFS_PHYSICAL_WIDTH=154 +Environment=QT_QPA_EGLFS_PHYSICAL_HEIGHT=86 +Environment=QT_QPA_EGLFS_WIDTH=1280 +Environment=QT_QPA_EGLFS_HEIGHT=1024 +Environment=QT_QPA_PLATFORM=eglfs +Environment=DISABLE_UPDATE_CHECK=True + +ExecStart=/usr/bin/dbus-run-session /usr/bin/python /home/pi/screenly/viewer.py +Restart=on-failure + +[Install] +WantedBy=multi-user.target +EOF + +cat << EOF > /etc/systemd/system/screenly-websocket.service +[Unit] +Description=Websocket Server layer +After=screenly-server.service + +[Service] +WorkingDirectory=/home/pi/screenly +User=pi + +Environment=HOME=/data + +ExecStart=/usr/bin/python /home/pi/screenly/websocket_server_layer.py +Restart=always + +[Install] +WantedBy=multi-user.target +EOF + +systemctl start screenly-server.service systemctl start screenly-viewer.service -systemctl start screenly-web.service -systemctl start screenly-websocket_server_layer.service +systemctl start screenly-websocket.service # By default docker gives us 64MB of shared memory size but to display heavy # pages we need more. From 715739e5434ed28bc16e3a87c3ed505d96b6fc77 Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Thu, 22 Nov 2018 17:03:37 +0600 Subject: [PATCH 012/224] Updated version of screenly-webview to v0.2 --- Dockerfile.template | 6 +++--- Dockerfile.viewer | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.template b/Dockerfile.template index 07391bd7d..6991b058e 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -63,9 +63,9 @@ RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so RUN mkdir /usr/local/share/ScreenlyWebview RUN curl -L \ - "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/screenly-webview-v0.1.tar.gz" \ - > /tmp/screenly-webview-v0.1.tar.gz -RUN tar -xzf /tmp/screenly-webview-v0.1.tar.gz -C /tmp + "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.2/screenly-webview-v0.2.tar.gz" \ + > /tmp/screenly-webview-v0.2.tar.gz +RUN tar -xzf /tmp/screenly-webview-v0.2.tar.gz -C /tmp RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview diff --git a/Dockerfile.viewer b/Dockerfile.viewer index 80ead4859..6aa37f0b2 100644 --- a/Dockerfile.viewer +++ b/Dockerfile.viewer @@ -57,9 +57,9 @@ ENV QT_QPA_PLATFORM eglfs RUN mkdir /usr/local/share/ScreenlyWebview RUN curl -L \ - "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/screenly-webview-v0.1.tar.gz" \ - > /tmp/screenly-webview-v0.1.tar.gz -RUN tar -xzf /tmp/screenly-webview-v0.1.tar.gz -C /tmp + "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.2/screenly-webview-v0.2.tar.gz" \ + > /tmp/screenly-webview-v0.2.tar.gz +RUN tar -xzf /tmp/screenly-webview-v0.2.tar.gz -C /tmp RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview From 3478099dc0be0bb490aa520c4a4a08f48603c6ef Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Thu, 22 Nov 2018 17:21:32 +0600 Subject: [PATCH 013/224] fix --- Dockerfile.template | 6 +++--- Dockerfile.viewer | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.template b/Dockerfile.template index 6991b058e..a2693dc77 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -63,9 +63,9 @@ RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so RUN mkdir /usr/local/share/ScreenlyWebview RUN curl -L \ - "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.2/screenly-webview-v0.2.tar.gz" \ - > /tmp/screenly-webview-v0.2.tar.gz -RUN tar -xzf /tmp/screenly-webview-v0.2.tar.gz -C /tmp + "https://github.com/Screenly/screenly-ose-webview/releases/download/0.2/screenly-webview-0.2.tar.gz" \ + > /tmp/screenly-webview-0.2.tar.gz +RUN tar -xzf /tmp/screenly-webview-0.2.tar.gz -C /tmp RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview diff --git a/Dockerfile.viewer b/Dockerfile.viewer index 6aa37f0b2..f8517d2e2 100644 --- a/Dockerfile.viewer +++ b/Dockerfile.viewer @@ -57,9 +57,9 @@ ENV QT_QPA_PLATFORM eglfs RUN mkdir /usr/local/share/ScreenlyWebview RUN curl -L \ - "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.2/screenly-webview-v0.2.tar.gz" \ - > /tmp/screenly-webview-v0.2.tar.gz -RUN tar -xzf /tmp/screenly-webview-v0.2.tar.gz -C /tmp + "https://github.com/Screenly/screenly-ose-webview/releases/download/0.2/screenly-webview-0.2.tar.gz" \ + > /tmp/screenly-webview-0.2.tar.gz +RUN tar -xzf /tmp/screenly-webview-0.2.tar.gz -C /tmp RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview From b403ae61a8491e734bd83d0433f4b9acc372401b Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Fri, 22 Mar 2019 14:24:03 +0600 Subject: [PATCH 014/224] Fix: Docker containers are now synchronized with the host --- ansible/roles/screenly/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index a80bd9ec6..52193897a 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -108,6 +108,8 @@ - /home/pi/screenly:/home/pi/screenly - /home/pi/.screenly:/home/pi/.screenly - /home/pi/screenly_assets:/home/pi/screenly_assets + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro - name: Create screenly-viewer container docker_container: @@ -123,6 +125,8 @@ - /home/pi/screenly:/home/pi/screenly - /home/pi/.screenly:/home/pi/.screenly - /home/pi/screenly_assets:/home/pi/screenly_assets + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro - name: Create screenly-websocket-server container docker_container: @@ -136,3 +140,5 @@ volumes: - /home/pi/screenly:/home/pi/screenly - /home/pi/.screenly:/home/pi/.screenly + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro From 3e876f04f7e40e2cc2073efd67bc1682909c342a Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Wed, 9 Oct 2019 09:27:13 +0600 Subject: [PATCH 015/224] Changes: webkit browser instead of UZBL --- .travis.yml | 3 +- ansible/roles/screenly/files/X.service | 11 -- ansible/roles/screenly/files/gtkrc-2.0 | 9 -- ansible/roles/screenly/files/matchbox.service | 12 -- .../screenly/files/plymouth-quit-wait.service | 8 -- .../screenly/files/plymouth-quit.service | 8 -- .../screenly/files/screenly-viewer.service | 32 ----- ansible/roles/screenly/files/uzbl-config | 5 - ansible/roles/screenly/tasks/main.yml | 85 ++++++++---- ansible/roles/screenly/vars/main.yml | 8 +- ansible/roles/splashscreen/tasks/main.yml | 12 +- ansible/roles/ssl/tasks/main.yml | 1 + ansible/roles/system/files/10-evdev.conf | 40 ------ .../roles/system/files/10-serverflags.conf | 6 - ansible/roles/system/tasks/main.yml | 125 +++++++++++------- ansible/site.yml | 12 +- bin/start_balena.sh | 2 - bin/start_viewer.sh | 21 +++ docker/Dockerfile.viewer | 74 +++++++++++ docker/Dockerfile.viewer.template | 1 - requirements/requirements.txt | 1 + requirements/requirements.viewer.txt | 14 ++ server.py | 4 +- viewer.py | 124 +++++------------ 24 files changed, 296 insertions(+), 322 deletions(-) delete mode 100644 ansible/roles/screenly/files/X.service delete mode 100644 ansible/roles/screenly/files/gtkrc-2.0 delete mode 100644 ansible/roles/screenly/files/matchbox.service delete mode 100755 ansible/roles/screenly/files/plymouth-quit-wait.service delete mode 100755 ansible/roles/screenly/files/plymouth-quit.service delete mode 100644 ansible/roles/screenly/files/screenly-viewer.service delete mode 100644 ansible/roles/screenly/files/uzbl-config delete mode 100644 ansible/roles/system/files/10-evdev.conf delete mode 100644 ansible/roles/system/files/10-serverflags.conf create mode 100644 bin/start_viewer.sh create mode 100644 docker/Dockerfile.viewer create mode 100644 requirements/requirements.viewer.txt diff --git a/.travis.yml b/.travis.yml index e95c6a3a9..a4a03c414 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,7 @@ install: - pip install -r requirements/requirements.txt - pip install -r requirements/requirements.dev.txt before_script: - - mkdir -p ~/.screenly ~/.config/uzbl/ ~/screenly_assets /tmp/USB/cleanup_folder - - cp ansible/roles/screenly/files/uzbl-config ~/.config/uzbl/config-screenly + - mkdir -p ~/.screenly ~/screenly_assets /tmp/USB/cleanup_folder - cp ansible/roles/screenly/files/screenly.conf ~/.screenly/ - cp ansible/roles/screenly/files/screenly.db ~/.screenly/ - sudo cp bin/install.sh /usr/local/sbin/upgrade_screenly.sh diff --git a/ansible/roles/screenly/files/X.service b/ansible/roles/screenly/files/X.service deleted file mode 100644 index b59dfee83..000000000 --- a/ansible/roles/screenly/files/X.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=X11 -After=network.target - -[Service] -ExecStart=/usr/bin/X -User=root -Restart=on-failure - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/ansible/roles/screenly/files/gtkrc-2.0 b/ansible/roles/screenly/files/gtkrc-2.0 deleted file mode 100644 index 8d399f94f..000000000 --- a/ansible/roles/screenly/files/gtkrc-2.0 +++ /dev/null @@ -1,9 +0,0 @@ -style "uzbl" { - GtkScrollbar::slider-width=0 - GtkScrollbar::trough-border=0 - GtkScrollbar::has-backward-stepper=0 - GtkScrollbar::has-forward-stepper=0 - GtkScrollbar::has-secondary-backward-stepper=0 - GtkScrollbar::has-secondary-forward-stepper=0 -} -widget "Uzbl*" style "uzbl" diff --git a/ansible/roles/screenly/files/matchbox.service b/ansible/roles/screenly/files/matchbox.service deleted file mode 100644 index 6bb0b06df..000000000 --- a/ansible/roles/screenly/files/matchbox.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=X11 -After=X.service - -[Service] -Environment=DISPLAY=:0.0 -ExecStart=/usr/bin/matchbox-window-manager -use_titlebar no -use_cursor no -User=pi -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/ansible/roles/screenly/files/plymouth-quit-wait.service b/ansible/roles/screenly/files/plymouth-quit-wait.service deleted file mode 100755 index 9099edc41..000000000 --- a/ansible/roles/screenly/files/plymouth-quit-wait.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Hold until boot process finishes up -After=rc-local.service plymouth-start.service systemd-user-sessions.service screenly-viewer.service - -[Service] -ExecStart=-/bin/plymouth --wait -Type=oneshot -TimeoutSec=0 diff --git a/ansible/roles/screenly/files/plymouth-quit.service b/ansible/roles/screenly/files/plymouth-quit.service deleted file mode 100755 index b24cf2012..000000000 --- a/ansible/roles/screenly/files/plymouth-quit.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Terminate Plymouth Boot Screen -After=rc-local.service plymouth-start.service systemd-user-sessions.service screenly-viewer.service - -[Service] -ExecStart=-/bin/plymouth quit -Type=oneshot -TimeoutSec=20 diff --git a/ansible/roles/screenly/files/screenly-viewer.service b/ansible/roles/screenly/files/screenly-viewer.service deleted file mode 100644 index e606d80b2..000000000 --- a/ansible/roles/screenly/files/screenly-viewer.service +++ /dev/null @@ -1,32 +0,0 @@ -[Unit] -Description=Screenly Viewer -After=matchbox.service screenly-web.service - -[Service] -WorkingDirectory=/home/pi/screenly -User=pi - -Environment=DISPLAY=:0.0 - -# Fix white flickering in omxplayer -Environment=NOREFRESH=1 - -Environment=PYTHONPATH=/home/pi/screenly - -# Don't activate screensaver -ExecStartPre=/usr/bin/xset s off - -# Disable DPMS (Energy Star) features -ExecStartPre=/usr/bin/xset -dpms - -# Don't blank the video device -ExecStartPre=/usr/bin/xset s noblank - -ExecStart=/usr/bin/python /home/pi/screenly/viewer.py -Restart=on-failure - -ExecStartPost=/bin/rm -f /tmp/uzbl_* -ExecStartPost=/bin/rm -f /tmp/screenly_html/* - -[Install] -WantedBy=multi-user.target diff --git a/ansible/roles/screenly/files/uzbl-config b/ansible/roles/screenly/files/uzbl-config deleted file mode 100644 index 74a3fa5c5..000000000 --- a/ansible/roles/screenly/files/uzbl-config +++ /dev/null @@ -1,5 +0,0 @@ -set show_status = 0 -set on_event = request ON_EVENT - -@on_event LOAD_START js alert=function(e){return true};confirm=function(e){return true};prompt=function(e){return true}; -@on_event LOAD_COMMIT js alert=function(e){return true};confirm=function(e){return true};prompt=function(e){return true}; diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index 822f54bcc..bea7d5346 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -7,7 +7,7 @@ with_items: - .screenly - .config - - .config/uzbl + - screenly_assets - name: Copy Screenly default config copy: @@ -31,20 +31,6 @@ state: absent dest: /home/pi/.screenly/screenly.conf -- name: Copy in GTK config - copy: - owner: pi - group: pi - src: gtkrc-2.0 - dest: /home/pi/.gtkrc-2.0 - -- name: Copy in UZBL config - copy: - owner: pi - group: pi - src: uzbl-config - dest: /home/pi/.config/uzbl/config-screenly - - name: Install pip dependencies pip: requirements=/home/pi/screenly/requirements/requirements.txt @@ -123,22 +109,67 @@ dest: "/etc/systemd/system/{{ item }}" with_items: "{{ screenly_systemd_units }}" -- name: Copy plymouth-quit-wait.service - copy: - src: plymouth-quit-wait.service +- name: Remove plymouth-quit-wait.service + file: + state: absent dest: /lib/systemd/system/plymouth-quit-wait.service - mode: 0644 - owner: root - group: root -- name: Copy plymouth-quit.service - copy: - src: plymouth-quit.service +- name: Remove plymouth-quit.service + file: + state: absent dest: /lib/systemd/system/plymouth-quit.service - mode: 0644 - owner: root - group: root - name: Enable screenly systemd services command: systemctl enable {{ item }} chdir=/etc/systemd/system with_items: "{{ screenly_systemd_units }}" + +- name: Check if deprecated systemd services exists + stat: + path: /etc/systemd/system/X.service + register: x_service + +- set_fact: x_service_exist="{{x_service.stat.exists}}" + +- name: Disable deprecated systemd services + systemd: + name: "{{ item }}" + state: stopped + enabled: no + with_items: "{{ deprecated_screenly_systemd_units }}" + when: x_service_exist + +- name: Remove deprecated systemd units + file: + path: "/etc/systemd/system/{{ item }}" + state: absent + with_items: "{{ deprecated_screenly_systemd_units }}" + +- name: Check /proc/device-tree/model file + command: cat /proc/device-tree/model + register: model_file + +- debug: + msg: "Device type: {{ device_type }}" + +- debug: + msg: "Use {{ docker_tag }} version of images." + +- name: Create screenly-viewer container + docker_container: + name: screenly-ose-viewer + image: "screenly/screenly-ose-viewer:{{ docker_tag }}-{{ device_type }}" + pull: true + state: started + recreate: true + restart_policy: unless-stopped + network_mode: host + privileged: yes + volumes: + - /home/pi/screenly:/home/pi/screenly + - /home/pi/.screenly:/home/pi/.screenly + - /home/pi/screenly_assets:/home/pi/screenly_assets + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + +- name: Pause screenly-viewer container + command: docker pause screenly-ose-viewer diff --git a/ansible/roles/screenly/vars/main.yml b/ansible/roles/screenly/vars/main.yml index aa9688ad5..3c335064e 100644 --- a/ansible/roles/screenly/vars/main.yml +++ b/ansible/roles/screenly/vars/main.yml @@ -1,8 +1,10 @@ screenly_systemd_units: - - X.service - - matchbox.service - screenly-celery.service - - screenly-viewer.service - screenly-web.service - screenly-websocket_server_layer.service - udev-restart.service + +deprecated_screenly_systemd_units: + - screenly-viewer.service + - X.service + - matchbox.service diff --git a/ansible/roles/splashscreen/tasks/main.yml b/ansible/roles/splashscreen/tasks/main.yml index 3018a8416..0b4b944f7 100644 --- a/ansible/roles/splashscreen/tasks/main.yml +++ b/ansible/roles/splashscreen/tasks/main.yml @@ -3,8 +3,9 @@ # If Jessie - name: Installs dependencies (Jessie) apt: - name: - - fbi + name: "{{ item }}" + with_items: + - fbi when: ansible_distribution_major_version|int <= 7 - name: Copies in splash screen @@ -43,9 +44,10 @@ - name: Installs dependencies (not Jessie) apt: - name: - - plymouth - - pix-plym-splash + name: "{{ item }}" + with_items: + - plymouth + - pix-plym-splash when: ansible_distribution_major_version|int > 7 - name: Copies plymouth theme diff --git a/ansible/roles/ssl/tasks/main.yml b/ansible/roles/ssl/tasks/main.yml index ace2021f0..763355af6 100644 --- a/ansible/roles/ssl/tasks/main.yml +++ b/ansible/roles/ssl/tasks/main.yml @@ -78,5 +78,6 @@ - reload systemctl - restart-screenly-websocket_server_layer - restart-screenly-server + - restart-screenly-celery tags: - enable-ssl diff --git a/ansible/roles/system/files/10-evdev.conf b/ansible/roles/system/files/10-evdev.conf deleted file mode 100644 index ba37ec34d..000000000 --- a/ansible/roles/system/files/10-evdev.conf +++ /dev/null @@ -1,40 +0,0 @@ -# -# Catch-all evdev loader for udev-based systems -# We don't simply match on any device since that also adds accelerometers -# and other devices that we don't really want to use. The list below -# matches everything but joysticks. - -#Section "InputClass" -# Identifier "evdev pointer catchall" -# MatchIsPointer "on" -# MatchDevicePath "/dev/input/event*" -# Driver "evdev" -#EndSection - -Section "InputClass" - Identifier "evdev keyboard catchall" - MatchIsKeyboard "on" - MatchDevicePath "/dev/input/event*" - Driver "evdev" -EndSection - -#Section "InputClass" -# Identifier "evdev touchpad catchall" -# MatchIsTouchpad "on" -# MatchDevicePath "/dev/input/event*" -# Driver "evdev" -#EndSection - -#Section "InputClass" -# Identifier "evdev tablet catchall" -# MatchIsTablet "on" -# MatchDevicePath "/dev/input/event*" -# Driver "evdev" -#EndSection - -#Section "InputClass" -# Identifier "evdev touchscreen catchall" -# MatchIsTouchscreen "on" -# MatchDevicePath "/dev/input/event*" -# Driver "evdev" -#EndSection diff --git a/ansible/roles/system/files/10-serverflags.conf b/ansible/roles/system/files/10-serverflags.conf deleted file mode 100644 index c7c69374a..000000000 --- a/ansible/roles/system/files/10-serverflags.conf +++ /dev/null @@ -1,6 +0,0 @@ -Section "ServerFlags" - Option "BlankTime" "0" - Option "StandbyTime" "0" - Option "SuspendTime" "0" - Option "OffTime" "0" -EndSection diff --git a/ansible/roles/system/tasks/main.yml b/ansible/roles/system/tasks/main.yml index d1f49f268..859895894 100644 --- a/ansible/roles/system/tasks/main.yml +++ b/ansible/roles/system/tasks/main.yml @@ -44,6 +44,30 @@ tags: - touches_boot_partition +- name: Add gpu_mem_256 in config.txt if it doesn't exist + lineinfile: + path: /boot/config.txt + line: gpu_mem_256=96 + when: config_txt.stdout.find('gpu_mem_256') == -1 + tags: + - touches_boot_partition + +- name: Add gpu_mem_512 in config.txt if it doesn't exist + lineinfile: + path: /boot/config.txt + line: gpu_mem_512=128 + when: config_txt.stdout.find('gpu_mem_512') == -1 + tags: + - touches_boot_partition + +- name: Add gpu_mem_1024 in config.txt if it doesn't exist + lineinfile: + path: /boot/config.txt + line: gpu_mem_1024=196 + when: config_txt.stdout.find('gpu_mem_1024') == -1 + tags: + - touches_boot_partition + - name: Backup kernel boot args copy: src: /boot/cmdline.txt @@ -144,37 +168,61 @@ - name: Install Screenly dependencies apt: - name: - - console-data - - libffi-dev - - libssl-dev - - matchbox - - omxplayer - - python-dev - - python-gobject - - python-netifaces - - python-simplejson - - rabbitmq-server - - rpi-update - - sqlite3 - - systemd - - uzbl - - x11-xserver-utils - - xserver-xorg + name: "{{ item }}" state: latest - -- name: Install systemd-sysv on Wheezy - command: bash -c 'echo "Yes, do as I say!" | apt-get install -y --force-yes systemd-sysv' - when: ansible_distribution_release == "wheezy" + with_items: + - console-data + - libffi-dev + - libssl-dev + - omxplayer + - python-dev + - python-gobject + - python-netifaces + - python-simplejson + - rabbitmq-server + - rpi-update + - sqlite3 + - systemd - name: Remove deprecated apt dependencies apt: - name: - - supervisor - - lightdm - - lightdm-gtk-greeter - - dphys-swapfile + name: "{{ item }}" state: absent + with_items: + - dphys-swapfile + - lightdm + - lightdm-gtk-greeter + - matchbox + - uzbl + - x11-xserver-utils + - xserver-xorg + +- name: Add docker apt key + apt_key: + url: https://download.docker.com/linux/raspbian/gpg + state: present + +- name : Get raspbian name + command: lsb_release -cs + register: raspbian_name + +- name: Add Docker repo + lineinfile: + path: /etc/apt/sources.list.d/docker.list + create: yes + line: "deb [arch=armhf] https://download.docker.com/linux/raspbian {{ raspbian_name.stdout }} edge" + state: present + +- name: Install Docker + apt: + name: docker-ce + update_cache: yes + install_recommends: no + +- name: Add pi to docker group + user: + name: pi + group: docker - name: Perform system upgrade apt: @@ -209,31 +257,6 @@ owner: root group: root -- name: Copy in evdev - copy: - src: 10-evdev.conf - dest: /usr/share/X11/xorg.conf.d/10-evdev.conf - mode: 0644 - owner: root - group: root - -- name: Disable DPMS - copy: - src: 10-serverflags.conf - dest: /usr/share/X11/xorg.conf.d/10-serverflags.conf - mode: 0644 - owner: root - group: root - -- name: Clear out X11 configs (disables touchpad and other unnecessary things) - file: - path: "/usr/share/X11/xorg.conf.d/{{ item }}" - state: absent - with_items: - - 50-synaptics.conf - - 10-quirks.conf - - 50-wacom.conf - - name: Disable swap command: /sbin/swapoff --all removes=/var/swap diff --git a/ansible/site.yml b/ansible/site.yml index d16b68967..38e335436 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -4,6 +4,8 @@ become: yes vars: manage_network: "{{ lookup('env', 'MANAGE_NETWORK') }}" + docker_tag: "{{ lookup('env', 'DOCKER_TAG') }}" + device_type: "{{ lookup('env', 'DEVICE_TYPE') }}" handlers: - name: restart-nginx @@ -20,14 +22,8 @@ - name: restart-screenly-server command: systemctl restart screenly-web.service - - name: restart-x-server - command: "systemctl restart {{ item }}" - with_items: - - X.service - - matchbox.service - - - name: restart-screenly-viewer - command: systemctl restart screenly-viewer.service + - name: restart-screenly-celery + command: systemctl restart screenly-celery.service roles: - system diff --git a/bin/start_balena.sh b/bin/start_balena.sh index 5a2a8d453..2f2210898 100755 --- a/bin/start_balena.sh +++ b/bin/start_balena.sh @@ -3,7 +3,6 @@ run_setup () { mkdir -p \ /data/.config \ - /data/.config/uzbl \ /data/.screenly \ /data/screenly \ /data/screenly_assets @@ -11,7 +10,6 @@ run_setup () { cp -n /tmp/screenly/ansible/roles/screenly/files/screenly.conf /data/.screenly/screenly.conf cp -n /tmp/screenly/ansible/roles/screenly/files/default_assets.yml /data/.screenly/default_assets.yml cp -n /tmp/screenly/ansible/roles/screenly/files/screenly.db /data/.screenly/screenly.db - cp -n /tmp/screenly/ansible/roles/screenly/files/uzbl-config /data/.config/uzbl/config-screenly cp -rf /tmp/screenly/* /data/screenly/ diff --git a/bin/start_viewer.sh b/bin/start_viewer.sh new file mode 100644 index 000000000..94b2d0706 --- /dev/null +++ b/bin/start_viewer.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +# SUGUSR1 from the viewer is also sent to the container +# Prevent it so that the container does not fall +trap '' 16 + +su - pi -c "cd /home/pi/screenly && QT_QPA_EGLFS_FORCE888=1 dbus-run-session python viewer.py &" + +# Waiting for the viewer +while true; do + PID=$(pidof python) + if [ "$?" == '0' ]; then + break + fi + sleep 0.5 +done + +# Exit when the viewer falls +while kill -0 "$PID"; do + sleep 1 +done diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer new file mode 100644 index 000000000..8493a0323 --- /dev/null +++ b/docker/Dockerfile.viewer @@ -0,0 +1,74 @@ +FROM resin/rpi-raspbian:stretch + +RUN apt-get update && \ + apt-get -y install \ + build-essential \ + curl \ + git-core \ + gstreamer0.10-plugins-good \ + libdbus-glib-1-dev \ + libffi-dev \ + libqt5webkit5 \ + libraspberrypi0 \ + libssl-dev \ + libts-dev \ + net-tools \ + omxplayer \ + psmisc \ + python-dev \ + python-gobject \ + python-netifaces \ + python-pip \ + python-setuptools \ + sqlite3 && \ + apt-get clean + +RUN pip install --upgrade pip + +# Install Python requirements +ADD requirements/requirements.viewer.txt /tmp/requirements.viewer.txt +RUN pip install -r /tmp/requirements.viewer.txt + +# QtBase from packages does not support eglfs +ARG PI_VERSION=pi1 +RUN curl -L \ + "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ + > /tmp/qtbase.tar.gz +RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local +RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf +RUN ldconfig + +# Fix symlinks +RUN rm /usr/lib/arm-linux-gnueabihf/libEGL.so.1 +RUN rm /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1 +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 + +RUN rm /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 +RUN rm /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 + +ENV QT_QPA_PLATFORM eglfs + +RUN mkdir /usr/local/share/ScreenlyWebview +RUN curl -L \ + "https://github.com/Screenly/screenly-ose-webview/releases/download/0.2/screenly-webview-0.2.tar.gz" \ + > /tmp/screenly-webview-0.2.tar.gz +RUN tar -xzf /tmp/screenly-webview-0.2.tar.gz -C /tmp + +RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res +RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview + +# Fix white flickering in omxplayer +ENV NOREFRESH 1 + +# Create runtime user +RUN useradd pi -d /home/pi \ + && /usr/sbin/usermod -a -G video pi + +WORKDIR /home/pi/screenly + +CMD ["bash", "bin/start_viewer.sh"] diff --git a/docker/Dockerfile.viewer.template b/docker/Dockerfile.viewer.template index cba9d8ccf..966224012 100644 --- a/docker/Dockerfile.viewer.template +++ b/docker/Dockerfile.viewer.template @@ -18,7 +18,6 @@ RUN apt-get update && \ libraspberrypi0 \ ifupdown \ sqlite3 \ - uzbl \ x11-xserver-utils \ xserver-xorg && \ apt-get clean diff --git a/requirements/requirements.txt b/requirements/requirements.txt index b7ed21f61..ac59c87f9 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -6,6 +6,7 @@ certifi==2018.4.16 cffi==1.7.0 click==6.7 configparser==3.5.0 +docker-py==1.10.6 Flask-Cors==3.0.4 flask-restful-swagger-2==0.35 flask-swagger-ui==3.0.12 diff --git a/requirements/requirements.viewer.txt b/requirements/requirements.viewer.txt new file mode 100644 index 000000000..382c08c72 --- /dev/null +++ b/requirements/requirements.viewer.txt @@ -0,0 +1,14 @@ +certifi==2018.4.16 +configparser==3.5.0 +cryptography==2.2.2 +flask==0.12.2 +idna==2.6 +mixpanel==4.3.2 +netifaces==0.10.4 +pydbus==0.6.0 +python-dateutil==2.4.2 +pytz==2012d +pyzmq==16.0.2 +requests[security]==2.18.4 +sh==1.08 +uptime==2.0.2 diff --git a/server.py b/server.py index 2a0b89ca3..69768e098 100755 --- a/server.py +++ b/server.py @@ -1447,7 +1447,7 @@ def get(self): viewlog = None try: viewlog = [line.decode('utf-8') for line in - check_output(['sudo', 'systemctl', 'status', 'screenly-viewer.service', '-n', '20']).split('\n')] + check_output(['docker', 'logs', 'screenly-ose-viewer', '--tail', '20']).split('\n')] except: pass @@ -1742,7 +1742,7 @@ def settings_page(): def system_info(): try: viewlog = [line.decode('utf-8') for line in - check_output(['sudo', 'systemctl', 'status', 'screenly-viewer.service', '-n', '20']).split('\n')] + check_output(['docker', 'logs', 'screenly-ose-viewer', '--tail', '20']).split('\n')] except Exception: viewlog = None diff --git a/viewer.py b/viewer.py index 4b098b0d1..3689625f9 100755 --- a/viewer.py +++ b/viewer.py @@ -16,12 +16,12 @@ from random import shuffle from threading import Thread from requests import get as req_get -from signal import alarm, signal, SIGALRM, SIGUSR1 +from signal import signal, SIGALRM, SIGUSR1 from time import sleep from settings import settings, LISTEN, PORT, ZmqConsumer -from lib import assets_helper, html_templates +from lib import assets_helper from lib import db from lib.diagnostics import get_git_branch, get_git_short_hash from lib.github import fetch_remote_hash, remote_branch_available @@ -40,14 +40,12 @@ INITIALIZED_FILE = '/.screenly/initialized' BLACK_PAGE = '/tmp/screenly_html/black_page.html' WATCHDOG_PATH = '/tmp/screenly.watchdog' -SCREENLY_HTML = '/tmp/screenly_html/' LOAD_SCREEN = '/screenly/static/img/loading.png' # relative to $HOME -UZBLRC = '/.config/uzbl/config-screenly' # relative to $HOME -INTRO = '/screenly/intro-template.html' current_browser_url = None browser = None loop_is_stopped = False +browser_bus = None VIDEO_TIMEOUT = 20 # secs @@ -212,8 +210,7 @@ def update_playlist(self): # Try to keep the same position in the play list. E.g. if a new asset is added to the end of the list, we # don't want to start over from the beginning. self.index = self.index % len(self.assets) if self.assets else 0 - logging.debug('update_playlist done, count %s, counter %s, index %s, deadline %s', len(self.assets), - self.counter, self.index, self.deadline) + logging.debug('update_playlist done, count %s, counter %s, index %s, deadline %s', len(self.assets), self.counter, self.index, self.deadline) def get_db_mtime(self): # get database file last modification time @@ -255,84 +252,35 @@ def watchdog(): utime(WATCHDOG_PATH, None) -def load_browser(url=None): - global browser, current_browser_url +def load_browser(): + global browser logging.info('Loading browser...') - if browser: - logging.info('killing previous uzbl %s', browser.pid) - browser.process.kill() + browser = sh.Command('ScreenlyWebview')(_bg=True, _err_to_out=True) + while 'Screenly service start' not in browser.process.stdout: + sleep(1) - if url is not None: - current_browser_url = url - # --config=- read commands (and config) from stdin - # --print-events print events to stdout - browser = sh.Command('uzbl-browser')(print_events=True, config='-', uri=current_browser_url, _bg=True) - logging.info('Browser loading %s. Running as PID %s.', current_browser_url, browser.pid) - - uzbl_rc = 'set ssl_verify = {}\n'.format('1' if settings['verify_ssl'] else '0') - with open(HOME + UZBLRC) as f: # load uzbl.rc - uzbl_rc = f.read() + uzbl_rc - browser_send(uzbl_rc) - - -def browser_get_event(): - alarm(10) - try: - event = browser.next() - except SigalrmException: - return None - alarm(0) - return event - - -def browser_send(command, cb=lambda _: True): - if not (browser is None) and browser.process.alive: - while not browser.process._pipe_queue.empty(): # flush stdout - browser_get_event() +def view_webpage(uri): + global current_browser_url - browser.process.stdin.put(command + '\n') - while True: # loop until cb returns True - try: - browser_event = browser_get_event() - except StopIteration: - break - if not browser_event: - break - if cb(browser_event): - break - else: - logging.info('browser found dead, restarting') + if browser is None or not browser.process.alive: load_browser() + if current_browser_url is not uri: + browser_bus.loadPage(uri) + current_browser_url = uri + logging.info('current url is {0}'.format(current_browser_url)) -def browser_clear(force=False): - """Load a black page. Default cb waits for the page to load.""" - browser_url('file://' + BLACK_PAGE, force=force, - cb=lambda buf: 'LOAD_FINISH' in buf and BLACK_PAGE in buf) - - -def browser_url(url, cb=lambda _: True, force=False): +def view_image(uri): global current_browser_url - if url == current_browser_url and not force: - logging.debug('Already showing %s, reloading it.', current_browser_url) - else: - current_browser_url = url - - """Uzbl handles full URI format incorrect: scheme://uname:passwd@domain:port/path - We need to escape @""" - escaped_url = current_browser_url.replace('@', '\\@') - - browser_send('uri ' + escaped_url, cb=cb) - logging.info('current url is %s', current_browser_url) - - -def view_image(uri): - browser_clear() - browser_send('js window.setimg("{0}")'.format(uri), - cb=lambda b: 'COMMAND_EXECUTED' in b and 'setimg' in b) + if browser is None or not browser.process.alive: + load_browser() + if current_browser_url is not uri: + browser_bus.loadImage(uri) + current_browser_url = uri + logging.info('current url is {0}'.format(current_browser_url)) def view_video(uri, duration): @@ -340,7 +288,7 @@ def view_video(uri, duration): if arch in ('armv6l', 'armv7l'): player_args = ['omxplayer', uri] - player_kwargs = {'o': settings['audio_output'], '_bg': True, '_ok_code': [0, 124, 143]} + player_kwargs = {'o': settings['audio_output'], 'layer': 1, '_bg': True, '_ok_code': [0, 124, 143]} else: player_args = ['mplayer', uri, '-nosound'] player_kwargs = {'_bg': True, '_ok_code': [0, 124]} @@ -350,7 +298,7 @@ def view_video(uri, duration): run = sh.Command(player_args[0])(*player_args[1:], **player_kwargs) - browser_clear(force=True) + view_image('null') try: while run.process.alive: watchdog() @@ -451,9 +399,7 @@ def asset_loop(scheduler): if 'image' in mime: view_image(uri) elif 'web' in mime: - # FIXME If we want to force periodic reloads of repeated web assets, force=True could be used here. - # See e38e6fef3a70906e7f8739294ffd523af6ce66be. - browser_url(uri) + view_webpage(uri) elif 'video' or 'streaming' in mime: view_video(uri, asset['duration']) else: @@ -470,7 +416,7 @@ def asset_loop(scheduler): def setup(): - global HOME, arch, db_conn + global HOME, arch, db_conn, browser_bus HOME = getenv('HOME', '/home/pi') arch = machine() @@ -480,8 +426,9 @@ def setup(): load_settings() db_conn = db.conn(settings['database']) - sh.mkdir(SCREENLY_HTML, p=True) - html_templates.black_page(BLACK_PAGE) + load_browser() + bus = pydbus.SessionBus() + browser_bus = bus.get('screenly.webview', '/Screenly') def setup_hotspot(): @@ -508,7 +455,7 @@ def setup_hotspot(): if not path.isfile(HOME + INITIALIZED_FILE) and not gateways().get('default'): if len(wireless_connections) == 0: url = 'http://{0}/hotspot'.format(LISTEN) - load_browser(url=url) + view_webpage(url) # Wait until the network is configured while not path.isfile(HOME + INITIALIZED_FILE) and not gateways().get('default'): @@ -549,15 +496,12 @@ def main(): scheduler = Scheduler() - if is_balena_app(): - load_browser() - else: + if not is_balena_app(): setup_hotspot() - url = 'http://{0}:{1}/splash-page'.format(LISTEN, PORT) if settings['show_splash'] else 'file://' + BLACK_PAGE - browser_url(url=url) - if settings['show_splash']: + url = 'http://{0}:{1}/splash-page'.format(LISTEN, PORT) if settings['show_splash'] else 'file://' + BLACK_PAGE + view_webpage(url) sleep(SPLASH_DELAY) # We don't want to show splash-page if there are active assets but all of them are not available From dd114aec3cfcf6a930631c082612752c4e1e5792 Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Wed, 9 Oct 2019 10:35:15 +0600 Subject: [PATCH 016/224] Changes: viewer_test --- tests/viewer_test.py | 53 ++++++-------------------------------------- 1 file changed, 7 insertions(+), 46 deletions(-) diff --git a/tests/viewer_test.py b/tests/viewer_test.py index 33c51058f..519d84039 100644 --- a/tests/viewer_test.py +++ b/tests/viewer_test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from nose.tools import ok_, eq_ +from nose.tools import eq_ from nose.plugins.attrib import attr import mock import unittest @@ -24,9 +24,6 @@ def setUp(self): self.m_cmd = mock.Mock(name='m_cmd') self.p_cmd = mock.patch.object(self.u.sh, 'Command', self.m_cmd) - self.m_send = mock.Mock(name='m_send') - self.p_send = mock.patch.object(self.u, 'browser_send', self.m_send) - self.m_killall = mock.Mock(name='killall') self.p_killall = mock.patch.object(self.u.sh, 'killall', self.m_killall) @@ -52,55 +49,19 @@ def test_empty(self): self.u.main() -class TestBrowserSend(ViewerTestCase): - def test_send(self): - self.p_cmd.start() - self.p_send.start() - self.u.setup() - self.u.load_browser() - self.p_send.stop() - self.p_cmd.stop() - - m_put = mock.Mock(name='uzbl_put') - self.m_cmd.return_value.return_value.process.stdin.put = m_put - - self.u.browser_send('test_cmd') - m_put.assert_called_once_with('test_cmd\n') - - self.u.browser_send('event TITLE 标题') - m_put.assert_called_with('event TITLE \xe6\xa0\x87\xe9\xa2\x98\n') - - def test_dead(self): - self.p_loadb.start() - self.u.browser_send(None) - self.m_loadb.assert_called_once() - self.p_loadb.stop() - - -class TestBrowserClear(ViewerTestCase): - def test_clear(self): - with mock.patch.object(self.u, 'browser_url', mock.Mock()) as m_url: - self.u.setup() - self.u.browser_clear() - m_url.assert_called_once() - - class TestLoadBrowser(ViewerTestCase): + @mock.patch('pydbus.SessionBus', mock.MagicMock()) def test_setup(self): + self.p_loadb.start() self.u.setup() - ok_(os.path.isdir(self.u.SCREENLY_HTML)) + self.p_loadb.stop() - def load_browser(self): - m_uzbl = mock.Mock(name='uzbl') - self.m_cmd.return_value = m_uzbl + def test_load_browser(self): + self.m_cmd.return_value.return_value.process.stdout = 'Screenly service start' self.p_cmd.start() - self.p_send.start() self.u.load_browser() - self.p_send.stop() self.p_cmd.stop() - self.m_cmd.assert_called_once_with('uzbl-browser') - m_uzbl.assert_called_once_with(print_events=True, config='-', uri=None, _bg=True) - m_send.assert_called_once() + self.m_cmd.assert_called_once_with('ScreenlyWebview') class TestSignalHandlers(ViewerTestCase): From e8afedfb956a311a5187e41f0399af8435f38516 Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Wed, 9 Oct 2019 11:30:39 +0600 Subject: [PATCH 017/224] Fix: viewers logs in UI --- ansible/roles/screenly/tasks/main.yml | 1 + server.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index bea7d5346..031c9d6b2 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -164,6 +164,7 @@ restart_policy: unless-stopped network_mode: host privileged: yes + log_driver: journald volumes: - /home/pi/screenly:/home/pi/screenly - /home/pi/.screenly:/home/pi/.screenly diff --git a/server.py b/server.py index 69768e098..bb6145a1a 100755 --- a/server.py +++ b/server.py @@ -1447,7 +1447,7 @@ def get(self): viewlog = None try: viewlog = [line.decode('utf-8') for line in - check_output(['docker', 'logs', 'screenly-ose-viewer', '--tail', '20']).split('\n')] + check_output(['journalctl', '-b', 'CONTAINER_NAME=screenly-ose-viewer', '-n', '20']).split('\n')] except: pass @@ -1742,7 +1742,7 @@ def settings_page(): def system_info(): try: viewlog = [line.decode('utf-8') for line in - check_output(['docker', 'logs', 'screenly-ose-viewer', '--tail', '20']).split('\n')] + check_output(['journalctl', '-b', 'CONTAINER_NAME=screenly-ose-viewer', '-n', '20']).split('\n')] except Exception: viewlog = None From e32cea1f58d556d2e4f4faf5bae1cd6574be4af0 Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Mon, 14 Oct 2019 09:59:11 +0600 Subject: [PATCH 018/224] Edits: initial balena changes --- bin/start_balena.sh | 32 +++++++++---------- docker-compose.yml | 2 +- docker/Dockerfile.viewer.template | 53 ++++++++++++++++++++++++------- 3 files changed, 57 insertions(+), 30 deletions(-) diff --git a/bin/start_balena.sh b/bin/start_balena.sh index 2f2210898..154cf5f30 100755 --- a/bin/start_balena.sh +++ b/bin/start_balena.sh @@ -34,10 +34,7 @@ run_viewer () { while true; do - /usr/bin/X 0<&- &>/dev/null & - /usr/bin/matchbox-window-manager -use_titlebar no -use_cursor no 0<&- &>/dev/null & - - error=$(/usr/bin/xset s off 2>&1 | grep -c "unable to open display") + error=$(curl 127.0.0.1:8080 2>&1 | grep -c "Failed to connect") if [[ "$error" -eq 0 ]]; then break fi @@ -46,22 +43,23 @@ run_viewer () { sleep 1 done - /usr/bin/xset -dpms - /usr/bin/xset s noblank - - while true; do + trap '' 16 - error=$(curl 127.0.0.1:8080 2>&1 | grep -c "Failed to connect") - if [[ "$error" -eq 0 ]]; then - break - fi + cd /data/screenly && QT_QPA_EGLFS_FORCE888=1 HOME=/data dbus-run-session python viewer.py & - echo "Still continue..." - sleep 1 + # Waiting for the viewer + while true; do + PID=$(pidof python) + if [ "$?" == '0' ]; then + break + fi + sleep 0.5 done - cd /data/screenly - /usr/bin/python viewer.py + # Exit when the viewer falls + while kill -0 "$PID"; do + sleep 1 + done } run_server () { @@ -98,4 +96,4 @@ fi if [[ "$SCREENLYSERVICE" = "celery" ]]; then run_celery -fi \ No newline at end of file +fi diff --git a/docker-compose.yml b/docker-compose.yml index 05fb30400..954667189 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,11 +21,11 @@ services: depends_on: - screenly-server environment: - - DISPLAY=:0.0 - HOME=/data - NOREFRESH=1 - PYTHONPATH=/data/screenly - SCREENLYSERVICE=viewer + - QT_QPA_PLATFORM=eglfs network_mode: "host" privileged: true volumes: diff --git a/docker/Dockerfile.viewer.template b/docker/Dockerfile.viewer.template index 966224012..b5005d388 100644 --- a/docker/Dockerfile.viewer.template +++ b/docker/Dockerfile.viewer.template @@ -1,35 +1,64 @@ -FROM balenalib/%%BALENA_MACHINE_NAME%%-debian:jessie +FROM balenalib/%%BALENA_MACHINE_NAME%%-debian:stretch RUN apt-get update && \ apt-get -y install \ build-essential \ curl \ git-core \ + gstreamer1.0-plugins-good \ + libdbus-glib-1-dev \ libffi-dev \ + libqt5webkit5 \ + libraspberrypi0 \ libssl-dev \ - matchbox \ + libts-dev \ net-tools \ omxplayer \ psmisc \ python-dev \ - python-imaging \ + python-gobject \ python-netifaces \ - python-simplejson \ - libraspberrypi0 \ - ifupdown \ - sqlite3 \ - x11-xserver-utils \ - xserver-xorg && \ + python-pip \ + python-setuptools \ + sqlite3 && \ apt-get clean # Install Python requirements -ADD requirements/requirements.txt /tmp/requirements.txt +ADD requirements/requirements.viewer.txt /tmp/requirements.txt RUN curl -s https://bootstrap.pypa.io/get-pip.py | python && \ pip install --upgrade -r /tmp/requirements.txt -COPY ansible/roles/screenly/files/gtkrc-2.0 /data/.gtkrc-2.0 +# QtBase from packages does not support eglfs +ARG PI_VERSION=pi3 +RUN curl -L \ + "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ + > /tmp/qtbase.tar.gz +RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local +RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf +RUN ldconfig + +# Fix symlinks +RUN rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1 +RUN rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1 +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 + +RUN rm -f /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 +RUN rm -f /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 + +RUN mkdir /usr/local/share/ScreenlyWebview +RUN curl -L \ + "https://github.com/Screenly/screenly-ose-webview/releases/download/0.2/screenly-webview-0.2.tar.gz" \ + > /tmp/screenly-webview-0.2.tar.gz +RUN tar -xzf /tmp/screenly-webview-0.2.tar.gz -C /tmp + +RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res +RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview COPY . /tmp/screenly -CMD ["bash", "chmod 777 /dev/vchiq"] CMD ["bash", "/tmp/screenly/bin/start_balena.sh"] From 21269ed3d50fa01666b3edd0d64d37b59bd18840 Mon Sep 17 00:00:00 2001 From: Emyll Almonte Date: Tue, 14 Jan 2020 13:16:06 -0500 Subject: [PATCH 019/224] Update install.sh adding autoremove and version.md file creation for screenly details.. --- bin/install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/install.sh b/bin/install.sh index a7b59d074..8726e915f 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -98,6 +98,7 @@ ansible-playbook site.yml $EXTRA_ARGS sudo apt-get autoclean sudo apt-get clean +sudo apt autoremove -y sudo find /usr/share/doc -depth -type f ! -name copyright -delete sudo find /usr/share/doc -empty -delete sudo rm -rf /usr/share/man /usr/share/groff /usr/share/info /usr/share/lintian /usr/share/linda /var/cache/man @@ -106,6 +107,8 @@ sudo find /usr/share/locale -mindepth 1 -maxdepth 1 ! -name 'en*' ! -name 'de*' cd ~/screenly && git rev-parse HEAD > ~/.screenly/latest_screenly_sha +echo -e "Screenly version: $(git rev-parse --abbrev-ref HEAD)@$(git rev-parse --short HEAD)\n$(lsb_release -a)" > ~/version.md + set +x echo "Installation completed." From 52e5323b1e8015f9ae17bbacc5b6df77e7f482e2 Mon Sep 17 00:00:00 2001 From: Emyll Almonte Date: Fri, 13 Mar 2020 22:34:05 -0400 Subject: [PATCH 020/224] Update main.yml updating due to ansible deprecation with loop and {{ items }} --- ansible/roles/system/tasks/main.yml | 40 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/ansible/roles/system/tasks/main.yml b/ansible/roles/system/tasks/main.yml index 46f93f1eb..12405273a 100644 --- a/ansible/roles/system/tasks/main.yml +++ b/ansible/roles/system/tasks/main.yml @@ -168,32 +168,30 @@ - name: Install Screenly dependencies apt: - name: "{{ item }}" + name: + - console-data + - libffi-dev + - libssl-dev + - python-dev + - python-netifaces + - rpi-update + - systemd state: latest - with_items: - - console-data - - libffi-dev - - libssl-dev - - python-dev - - python-netifaces - - rpi-update - - systemd - name: Remove deprecated apt dependencies apt: - name: "{{ item }}" + name: + - dphys-swapfile + - lightdm + - lightdm-gtk-greeter + - matchbox + - omxplayer + - sqlite3 + - supervisor + - uzbl + - x11-xserver-utils + - xserver-xorg state: absent - with_items: - - dphys-swapfile - - lightdm - - lightdm-gtk-greeter - - matchbox - - omxplayer - - sqlite3 - - supervisor - - uzbl - - x11-xserver-utils - - xserver-xorg - name: Add docker apt key apt_key: From 5f3f0e7458b6f7e712366631f14b9e112a81ba7a Mon Sep 17 00:00:00 2001 From: Emyll Almonte Date: Wed, 21 Oct 2020 18:34:41 -0400 Subject: [PATCH 021/224] Update main.yml --- ansible/roles/screenly/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index bd1759c91..7292c6d3d 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -50,8 +50,8 @@ - cron: name: Cleanup screenly_assets - minute: 0 - hour: 1 + minute: "0" + hour: "1" job: "/usr/local/bin/screenly_utils.sh cleanup" user: pi From b81b4aa8f96871eb9e5e819d4d6b2746497f5bee Mon Sep 17 00:00:00 2001 From: Emyll Almonte Date: Wed, 21 Oct 2020 18:42:13 -0400 Subject: [PATCH 022/224] Update main.yml --- ansible/roles/screenly/tasks/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index 7292c6d3d..70ee66216 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -48,8 +48,9 @@ owner: root group: root -- cron: - name: Cleanup screenly_assets +- name: Create screenly_assets cleanup cron job + cron: + name: "Cleanup screenly_assets" minute: "0" hour: "1" job: "/usr/local/bin/screenly_utils.sh cleanup" From a9eb810a5d97dc9274cba4a8885b7b26dc8555d1 Mon Sep 17 00:00:00 2001 From: Emyll Almonte Date: Wed, 21 Oct 2020 18:59:53 -0400 Subject: [PATCH 023/224] Update main.yml --- ansible/roles/network/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/roles/network/tasks/main.yml b/ansible/roles/network/tasks/main.yml index f5e6da676..09ab62fb3 100644 --- a/ansible/roles/network/tasks/main.yml +++ b/ansible/roles/network/tasks/main.yml @@ -13,7 +13,7 @@ command: systemctl disable screenly-net-watchdog.timer when: screenly_network_manager_exist -- name: Remove network manger and watchdog +- name: Remove network manager and watchdog file: state: absent path: "/usr/sbin/{{ item }}" @@ -60,16 +60,16 @@ - set_fact: resin_wifi_version_file_exist="{{resin_wifi_version_file.stat.exists}}" when: ansible_distribution_major_version|int >= 9 -- name: Download resin-wifi-connect release +- name: Download balena wifi-connect release get_url: - url: "https://github.com/resin-io/resin-wifi-connect/releases/download/v{{ resin_wifi_connect_version }}/wifi-connect-v{{ resin_wifi_connect_version }}-linux-rpi.tar.gz" + url: "https://github.com/balena-io/wifi-connect/releases/download/v{{ resin_wifi_connect_version }}/wifi-connect-v{{ resin_wifi_connect_version }}-linux-rpi.tar.gz" dest: /home/pi/resin-wifi-connect.tar.gz when: - ansible_distribution_major_version|int >= 9 - not resin_wifi_version_file_exist - manage_network|bool == true -- name: Unarchive resin-wifi-connect release +- name: Unarchive balena wifi-connect release unarchive: src: /home/pi/resin-wifi-connect.tar.gz dest: /home/pi @@ -100,7 +100,7 @@ - not resin_wifi_version_file_exist - manage_network|bool == true -- name: Touch resin-wifi-connect version file +- name: Touch balena wifi-connect version file file: state: touch path: "/usr/local/share/wifi-connect/ui/{{ resin_wifi_connect_version }}" From 3ed526fbcd31e45fbc0dc6e852e70a262b588a4e Mon Sep 17 00:00:00 2001 From: Emyll Almonte Date: Wed, 21 Oct 2020 19:20:43 -0400 Subject: [PATCH 024/224] Update main.yml --- ansible/roles/splashscreen/tasks/main.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ansible/roles/splashscreen/tasks/main.yml b/ansible/roles/splashscreen/tasks/main.yml index ebab3410a..0ba9b9454 100644 --- a/ansible/roles/splashscreen/tasks/main.yml +++ b/ansible/roles/splashscreen/tasks/main.yml @@ -3,9 +3,7 @@ # If Jessie - name: Installs dependencies (Jessie) apt: - name: "{{ item }}" - with_items: - - fbi + name: fbi when: ansible_distribution_major_version|int <= 7 - name: Copies in splash screen @@ -44,9 +42,7 @@ - name: Installs dependencies (not Jessie) apt: - name: "{{ item }}" - with_items: - - plymouth + name: plymouth when: ansible_distribution_major_version|int > 7 - name: Copies plymouth theme From 66894eb980789c895be95dc69dbf1bcd0ea78e15 Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Tue, 3 Nov 2020 13:58:30 +0600 Subject: [PATCH 025/224] Edits: ansible tasks and travis.yml --- .travis.yml | 57 +++++++++++++------ .../roles/screenly/files/screenly-web.service | 15 +++++ .../screenly-websocket_server_layer.service | 11 ++++ 3 files changed, 65 insertions(+), 18 deletions(-) create mode 100644 ansible/roles/screenly/files/screenly-web.service create mode 100644 ansible/roles/screenly/files/screenly-websocket_server_layer.service diff --git a/.travis.yml b/.travis.yml index b37864c3c..a4a03c414 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,29 +1,50 @@ language: python python: - "2.7" - -services: - - docker - +virtualenv: + system_site_packages: true +addons: + firefox: "45.0" + apt: + update: true + packages: + - net-tools + - mplayer + - ffmpeg + - python-gobject + - python-setuptools install: - - docker build . -f ./docker/Dockerfile.travis -t screenly/travis-ci - - docker run --name travis-ci -v $TRAVIS_BUILD_DIR:/root/screenly -td screenly/travis-ci /bin/bash - + - pip install -U pip + - pip install -r requirements/requirements.txt + - pip install -r requirements/requirements.dev.txt before_script: - - docker exec travis-ci bash -c "echo -e '[local]\nlocalhost ansible_connection=local' > ansible/localhost" - - docker exec travis-ci bash -c "python tests/rtmplite/rtmp.py -r /tmp/" & - - sleep 3 - - docker exec travis-ci bash -c "python server.py" & - - sleep 3 - - docker exec travis-ci bash -c "Xvfb :99 -ac" & + - mkdir -p ~/.screenly ~/screenly_assets /tmp/USB/cleanup_folder + - cp ansible/roles/screenly/files/screenly.conf ~/.screenly/ + - cp ansible/roles/screenly/files/screenly.db ~/.screenly/ + - sudo cp bin/install.sh /usr/local/sbin/upgrade_screenly.sh + - sudo chmod 0700 /usr/local/sbin/upgrade_screenly.sh + - echo -e "[local]\nlocalhost ansible_connection=local" > ansible/localhost + - curl https://www.screenly.io/upload/ose-logo.png > /tmp/image.png + - cp /tmp/image.png /tmp/USB/image.png + - cp /tmp/image.png /tmp/USB/cleanup_folder/image.png + - curl https://www.screenly.io/upload/ose-logo.png > ~/screenly_assets/image.tmp + - curl https://www.screenly.io/upload/big_buck_bunny_720p_10mb.flv > /tmp/video.flv + - cp tests/assets/asset.mov /tmp/asset.mov + - export DISPLAY=:99.0 + - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 + - sudo cp tests/config/ffserver.conf /etc/ffserver.conf + - /usr/bin/ffserver -f /etc/ffserver.conf & - sleep 3 + - python server.py & + - sleep 3 # give xvfb some time to start + script: - - docker exec -ti travis-ci bash -c "find . ! -path '*/rtmplite/*' -name \*.py -exec pep8 --ignore=E402,E501,E731 {} +" - - docker exec -ti travis-ci bash -c "nosetests -v -a '!fixme' --with-isolation" - - docker exec -ti travis-ci bash -c "ansible-playbook --syntax-check -i ansible/localhost ansible/site.yml" - - python -m SimpleHTTPServer 8080 & + - find . ! -path "*/rtmplite/*" -name \*.py -exec pep8 --ignore=E402,E501,E731 {} + + - nosetests -v -a '!fixme' + - ansible-playbook --syntax-check -i ansible/localhost ansible/site.yml + - python -m SimpleHTTPServer 8081 & - sleep 3 - bash static/spec/runner.sh sudo: false -dist: trusty +dist: xenial diff --git a/ansible/roles/screenly/files/screenly-web.service b/ansible/roles/screenly/files/screenly-web.service new file mode 100644 index 000000000..15051195c --- /dev/null +++ b/ansible/roles/screenly/files/screenly-web.service @@ -0,0 +1,15 @@ +[Unit] +Description=Screenly Web UI +After=network-online.target + +[Service] +WorkingDirectory=/home/pi/screenly +User=pi +ExecStartPre=/usr/bin/python /home/pi/screenly/bin/wait.py +ExecStart=/usr/bin/python /home/pi/screenly/server.py +Restart=always +RestartSec=5 +Environment=PYTHONPATH=/home/pi/screenly + +[Install] +WantedBy=multi-user.target diff --git a/ansible/roles/screenly/files/screenly-websocket_server_layer.service b/ansible/roles/screenly/files/screenly-websocket_server_layer.service new file mode 100644 index 000000000..e196768c0 --- /dev/null +++ b/ansible/roles/screenly/files/screenly-websocket_server_layer.service @@ -0,0 +1,11 @@ +[Unit] +Description=Websocket Server layer + +[Service] +WorkingDirectory=/home/pi/screenly +User=pi +ExecStart=/usr/bin/python /home/pi/screenly/websocket_server_layer.py +Restart=always + +[Install] +WantedBy=multi-user.target \ No newline at end of file From b77e7da33a174edffa7e7dc0b1a393abfad5e470 Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Tue, 3 Nov 2020 15:14:22 +0600 Subject: [PATCH 026/224] Fix: ansible screenly role --- ansible/roles/screenly/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index d9917e37b..1c6353424 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -110,7 +110,6 @@ src: "{{ item }}" dest: "/etc/systemd/system/{{ item }}" with_items: "{{ screenly_systemd_units }}" - when: x_service_exist - name: Remove plymouth-quit-wait.service file: From ab91057f357b9e3f8a9378a87c46eec325af8b18 Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Tue, 3 Nov 2020 17:34:29 +0600 Subject: [PATCH 027/224] Fix for successfull running --- ansible/roles/screenly/tasks/main.yml | 2 +- package-lock.json | 6 + package.json | 3 + static/js/screenly-ose.js | 1672 ++++++++++++------------- static/js/screenly-ose.js.map | 5 +- viewer.py | 2 +- 6 files changed, 841 insertions(+), 849 deletions(-) diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index 1c6353424..ad60aa60d 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -159,7 +159,7 @@ - name: Create screenly-viewer container docker_container: name: screenly-ose-viewer - image: "screenly/screenly-ose-viewer:{{ docker_tag }}-{{ device_type }}" + image: "ruskodevelop/screenly-ose-viewer:latest" pull: true state: started recreate: true diff --git a/package-lock.json b/package-lock.json index 705a75280..ffe186c6d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,12 @@ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz", "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==" }, + "coffee-script": { + "version": "1.12.7", + "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz", + "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==", + "dev": true + }, "css-toggle-switch": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/css-toggle-switch/-/css-toggle-switch-4.1.0.tgz", diff --git a/package.json b/package.json index 48535251a..7599217fc 100644 --- a/package.json +++ b/package.json @@ -4,5 +4,8 @@ "dependencies": { "bootstrap": "^4.3.1", "css-toggle-switch": "^4.1.0" + }, + "devDependencies": { + "coffee-script": "^1.12.7" } } diff --git a/static/js/screenly-ose.js b/static/js/screenly-ose.js index 57aa7d188..7a474c663 100644 --- a/static/js/screenly-ose.js +++ b/static/js/screenly-ose.js @@ -1,10 +1,14 @@ -// Generated by CoffeeScript 2.5.1 +// Generated by CoffeeScript 1.12.7 + +/* screenly-ose ui */ + (function() { - /* screenly-ose ui */ var API, AddAssetView, App, Asset, AssetRowView, Assets, AssetsView, EditAssetView, dateSettings, date_to, delay, domains, durationSecondsToHumanReadable, getMimetype, get_filename, get_template, insertWbr, mimetypes, now, truncate_str, url_test, viduris, - indexOf = [].indexOf, - boundMethodCheck = function(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new Error('Bound instance method accessed before binding'); } }, - hasProp = {}.hasOwnProperty; + indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }, + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty, + slice = [].slice; $().ready(function() { return $('#subsribe-form-container').popover({ @@ -30,11 +34,10 @@ dateSettings.datepickerFormat = dateFormat; - dateSettings.fullDate = `${dateSettings.date} ${dateSettings.fullTime}`; + dateSettings.fullDate = dateSettings.date + " " + dateSettings.fullTime; API.date_to = date_to = function(d) { var dd; - // Cross-browser UTC to localtime conversion dd = moment.utc(d).local(); return { string: function() { @@ -54,7 +57,7 @@ }; get_template = function(name) { - return _.template(($(`#${name}-template`)).html()); + return _.template(($("#" + name + "-template")).html()); }; delay = function(wait, fn) { @@ -122,82 +125,79 @@ return (v.replace(/\//g, '/')).replace(/\&/g, '&'); }; - // Tell Backbone to send its saves as JSON-encoded. Backbone.emulateJSON = false; - // Models - API.Asset = Asset = (function() { - class Asset extends Backbone.Model { - constructor() { - super(...arguments); - this.active = this.active.bind(this); - this.backup = this.backup.bind(this); - this.rollback = this.rollback.bind(this); - this.old_name = this.old_name.bind(this); - } + API.Asset = Asset = (function(superClass) { + extend(Asset, superClass); - defaults() { - return { - name: '', - mimetype: 'webpage', - uri: '', - is_active: 1, - start_date: '', - end_date: '', - duration: defaultDuration, - is_enabled: 0, - is_processing: 0, - nocache: 0, - play_order: 0, - skip_asset_check: 0 - }; - } + function Asset() { + this.old_name = bind(this.old_name, this); + this.rollback = bind(this.rollback, this); + this.backup = bind(this.backup, this); + this.active = bind(this.active, this); + return Asset.__super__.constructor.apply(this, arguments); + } - active() { - var at, end_date, start_date; - boundMethodCheck(this, Asset); - if (this.get('is_enabled') && this.get('start_date') && this.get('end_date')) { - at = now(); - start_date = new Date(this.get('start_date')); - end_date = new Date(this.get('end_date')); - return (start_date <= at && at <= end_date); - } else { - return false; - } - } + Asset.prototype.idAttribute = "asset_id"; - backup() { - boundMethodCheck(this, Asset); - return this.backup_attributes = this.toJSON(); - } + Asset.prototype.fields = 'name mimetype uri start_date end_date duration skip_asset_check'.split(' '); - rollback() { - boundMethodCheck(this, Asset); - if (this.backup_attributes) { - this.set(this.backup_attributes); - return this.backup_attributes = void 0; - } - } + Asset.prototype.defaults = function() { + return { + name: '', + mimetype: 'webpage', + uri: '', + is_active: 1, + start_date: '', + end_date: '', + duration: defaultDuration, + is_enabled: 0, + is_processing: 0, + nocache: 0, + play_order: 0, + skip_asset_check: 0 + }; + }; - old_name() { - boundMethodCheck(this, Asset); - if (this.backup_attributes) { - return this.backup_attributes.name; - } + Asset.prototype.active = function() { + var at, end_date, start_date; + if (this.get('is_enabled') && this.get('start_date') && this.get('end_date')) { + at = now(); + start_date = new Date(this.get('start_date')); + end_date = new Date(this.get('end_date')); + return (start_date <= at && at <= end_date); + } else { + return false; } + }; + Asset.prototype.backup = function() { + return this.backup_attributes = this.toJSON(); }; - Asset.prototype.idAttribute = "asset_id"; + Asset.prototype.rollback = function() { + if (this.backup_attributes) { + this.set(this.backup_attributes); + return this.backup_attributes = void 0; + } + }; - Asset.prototype.fields = 'name mimetype uri start_date end_date duration skip_asset_check'.split(' '); + Asset.prototype.old_name = function() { + if (this.backup_attributes) { + return this.backup_attributes.name; + } + }; return Asset; - }).call(this); + })(Backbone.Model); + + API.Assets = Assets = (function(superClass) { + extend(Assets, superClass); - API.Assets = Assets = (function() { - class Assets extends Backbone.Collection {}; + function Assets() { + return Assets.__super__.constructor.apply(this, arguments); + } Assets.prototype.url = "/api/v1.2/assets"; @@ -207,812 +207,798 @@ return Assets; - }).call(this); + })(Backbone.Collection); - // Views API.View = {}; - API.View.AddAssetView = AddAssetView = (function() { - class AddAssetView extends Backbone.View { - constructor() { - super(...arguments); - this.$f = this.$f.bind(this); - this.$fv = this.$fv.bind(this); - this.initialize = this.initialize.bind(this); - this.viewmodel = this.viewmodel.bind(this); - this.save = this.save.bind(this); - this.toggleSkipAssetCheck = this.toggleSkipAssetCheck.bind(this); - this.change_mimetype = this.change_mimetype.bind(this); - this.clickTabNavUpload = this.clickTabNavUpload.bind(this); - this.clickTabNavUri = this.clickTabNavUri.bind(this); - this.updateUriMimetype = this.updateUriMimetype.bind(this); - this.updateFileUploadMimetype = this.updateFileUploadMimetype.bind(this); - this.updateMimetype = this.updateMimetype.bind(this); - this.change = this.change.bind(this); - this.validate = this.validate.bind(this); - this.cancel = this.cancel.bind(this); - this.destroyFileUploadWidget = this.destroyFileUploadWidget.bind(this); - } + API.View.AddAssetView = AddAssetView = (function(superClass) { + extend(AddAssetView, superClass); + + function AddAssetView() { + this.destroyFileUploadWidget = bind(this.destroyFileUploadWidget, this); + this.cancel = bind(this.cancel, this); + this.validate = bind(this.validate, this); + this.change = bind(this.change, this); + this.updateMimetype = bind(this.updateMimetype, this); + this.updateFileUploadMimetype = bind(this.updateFileUploadMimetype, this); + this.updateUriMimetype = bind(this.updateUriMimetype, this); + this.clickTabNavUri = bind(this.clickTabNavUri, this); + this.clickTabNavUpload = bind(this.clickTabNavUpload, this); + this.change_mimetype = bind(this.change_mimetype, this); + this.toggleSkipAssetCheck = bind(this.toggleSkipAssetCheck, this); + this.save = bind(this.save, this); + this.viewmodel = bind(this.viewmodel, this); + this.initialize = bind(this.initialize, this); + this.$fv = bind(this.$fv, this); + this.$f = bind(this.$f, this); + return AddAssetView.__super__.constructor.apply(this, arguments); + } - $f(field) { - boundMethodCheck(this, AddAssetView); - return this.$(`[name='${field}']`); - } + AddAssetView.prototype.$f = function(field) { + return this.$("[name='" + field + "']"); + }; - $fv(field, ...val) { - boundMethodCheck(this, AddAssetView); - return (this.$f(field)).val(...val); // get or set filed value - } + AddAssetView.prototype.$fv = function() { + var field, ref, val; + field = arguments[0], val = 2 <= arguments.length ? slice.call(arguments, 1) : []; + return (ref = this.$f(field)).val.apply(ref, val); + }; - initialize(oprions) { - var d, deadline, deadlines, tag; - boundMethodCheck(this, AddAssetView); - ($('body')).append(this.$el.html(get_template('asset-modal'))); - (this.$el.children(":first")).modal(); - (this.$('.cancel')).val('Back to Assets'); - deadlines = { - start: now(), - end: (moment().add('days', 30)).toDate() - }; - for (tag in deadlines) { - if (!hasProp.call(deadlines, tag)) continue; - deadline = deadlines[tag]; - d = date_to(deadline); - this.$fv(`${tag}_date_date`, d.date()); - this.$fv(`${tag}_date_time`, d.time()); - } - return false; + AddAssetView.prototype.initialize = function(oprions) { + var d, deadline, deadlines, tag; + ($('body')).append(this.$el.html(get_template('asset-modal'))); + (this.$el.children(":first")).modal(); + (this.$('.cancel')).val('Back to Assets'); + deadlines = { + start: now(), + end: (moment().add('days', 30)).toDate() + }; + for (tag in deadlines) { + if (!hasProp.call(deadlines, tag)) continue; + deadline = deadlines[tag]; + d = date_to(deadline); + this.$fv(tag + "_date_date", d.date()); + this.$fv(tag + "_date_time", d.time()); } + return false; + }; - viewmodel(model) { - var field, k, l, len, len1, ref, ref1, results, which; - boundMethodCheck(this, AddAssetView); - ref = ['start', 'end']; - for (k = 0, len = ref.length; k < len; k++) { - which = ref[k]; - this.$fv(`${which}_date`, (moment((this.$fv(`${which}_date_date`)) + " " + (this.$fv(`${which}_date_time`)), dateSettings.fullDate)).toDate().toISOString()); - } - ref1 = model.fields; - results = []; - for (l = 0, len1 = ref1.length; l < len1; l++) { - field = ref1[l]; - if (!(this.$f(field)).prop('disabled')) { - results.push(model.set(field, this.$fv(field), { - silent: true - })); - } + AddAssetView.prototype.viewmodel = function(model) { + var field, k, l, len, len1, ref, ref1, results, which; + ref = ['start', 'end']; + for (k = 0, len = ref.length; k < len; k++) { + which = ref[k]; + this.$fv(which + "_date", (moment((this.$fv(which + "_date_date")) + " " + (this.$fv(which + "_date_time")), dateSettings.fullDate)).toDate().toISOString()); + } + ref1 = model.fields; + results = []; + for (l = 0, len1 = ref1.length; l < len1; l++) { + field = ref1[l]; + if (!(this.$f(field)).prop('disabled')) { + results.push(model.set(field, this.$fv(field), { + silent: true + })); } - return results; } + return results; + }; - save(e) { - var model, save; - boundMethodCheck(this, AddAssetView); - if ((this.$fv('uri')) === '') { - return false; - } - if ((this.$('#tab-uri')).hasClass('active')) { - model = new Asset({}, { - collection: API.assets - }); - this.$fv('mimetype', ''); - this.updateUriMimetype(); - this.viewmodel(model); - model.set({ - name: model.get('uri') - }, { - silent: true - }); - save = model.save(); - (this.$('input')).prop('disabled', true); - save.done((data) => { + AddAssetView.prototype.events = { + 'change': 'change', + 'click #save-asset': 'save', + 'click .cancel': 'cancel', + 'hidden.bs.modal': 'destroyFileUploadWidget', + 'click .tabnav-uri': 'clickTabNavUri', + 'click .tabnav-file_upload': 'clickTabNavUpload', + 'change .is_enabled-skip_asset_check_checkbox': 'toggleSkipAssetCheck' + }; + + AddAssetView.prototype.save = function(e) { + var model, save; + if ((this.$fv('uri')) === '') { + return false; + } + if ((this.$('#tab-uri')).hasClass('active')) { + model = new Asset({}, { + collection: API.assets + }); + this.$fv('mimetype', ''); + this.updateUriMimetype(); + this.viewmodel(model); + model.set({ + name: model.get('uri') + }, { + silent: true + }); + save = model.save(); + (this.$('input')).prop('disabled', true); + save.done((function(_this) { + return function(data) { model.id = data.asset_id; - (this.$el.children(":first")).modal('hide'); + (_this.$el.children(":first")).modal('hide'); _.extend(model.attributes, data); return model.collection.add(model); - }); - save.fail(() => { - (this.$('input')).prop('disabled', false); + }; + })(this)); + save.fail((function(_this) { + return function() { + (_this.$('input')).prop('disabled', false); return model.destroy(); - }); - } - return false; + }; + })(this)); } + return false; + }; - toggleSkipAssetCheck(e) { - boundMethodCheck(this, AddAssetView); - return this.$fv('skip_asset_check', parseInt(this.$fv('skip_asset_check')) === 1 ? 0 : 1); - } + AddAssetView.prototype.toggleSkipAssetCheck = function(e) { + return this.$fv('skip_asset_check', parseInt(this.$fv('skip_asset_check')) === 1 ? 0 : 1); + }; - change_mimetype() { - boundMethodCheck(this, AddAssetView); - if ((this.$fv('mimetype')) === "video") { - return this.$fv('duration', 0); - } else if ((this.$fv('mimetype')) === "streaming") { - return this.$fv('duration', defaultStreamingDuration); - } else { - return this.$fv('duration', defaultDuration); - } + AddAssetView.prototype.change_mimetype = function() { + if ((this.$fv('mimetype')) === "video") { + return this.$fv('duration', 0); + } else if ((this.$fv('mimetype')) === "streaming") { + return this.$fv('duration', defaultStreamingDuration); + } else { + return this.$fv('duration', defaultDuration); } + }; - clickTabNavUpload(e) { - var that; - boundMethodCheck(this, AddAssetView); - if (!(this.$('#tab-file_upload')).hasClass('active')) { - (this.$('ul.nav-tabs li')).removeClass('active show'); - (this.$('.tab-pane')).removeClass('active'); - (this.$('.tabnav-file_upload')).addClass('active show'); - (this.$('#tab-file_upload')).addClass('active'); - (this.$('.uri')).hide(); - (this.$('.skip_asset_check_checkbox')).hide(); - (this.$('#save-asset')).hide(); - that = this; - (this.$("[name='file_upload']")).fileupload({ - autoUpload: false, - sequentialUploads: true, - maxChunkSize: 5000000, //5 MB - url: 'api/v1/file_asset', - progressall: (e, data) => { + AddAssetView.prototype.clickTabNavUpload = function(e) { + var that; + if (!(this.$('#tab-file_upload')).hasClass('active')) { + (this.$('ul.nav-tabs li')).removeClass('active show'); + (this.$('.tab-pane')).removeClass('active'); + (this.$('.tabnav-file_upload')).addClass('active show'); + (this.$('#tab-file_upload')).addClass('active'); + (this.$('.uri')).hide(); + (this.$('.skip_asset_check_checkbox')).hide(); + (this.$('#save-asset')).hide(); + that = this; + (this.$("[name='file_upload']")).fileupload({ + autoUpload: false, + sequentialUploads: true, + maxChunkSize: 5000000, + url: 'api/v1/file_asset', + progressall: (function(_this) { + return function(e, data) { if (data.loaded && data.total) { - return (this.$('.progress .bar')).css('width', `${data.loaded / data.total * 100}%`); + return (_this.$('.progress .bar')).css('width', (data.loaded / data.total * 100) + "%"); } - }, - add: function(e, data) { - var filename, model; - (that.$('.status')).hide(); - (that.$('.progress')).show(); - model = new Asset({}, { - collection: API.assets + }; + })(this), + add: function(e, data) { + var filename, model; + (that.$('.status')).hide(); + (that.$('.progress')).show(); + model = new Asset({}, { + collection: API.assets + }); + filename = data['files'][0]['name']; + that.$fv('name', filename); + that.updateFileUploadMimetype(filename); + that.viewmodel(model); + return data.submit().success(function(uri) { + var save; + model.set({ + uri: uri + }, { + silent: true + }); + save = model.save(); + save.done(function(data) { + model.id = data.asset_id; + _.extend(model.attributes, data); + return model.collection.add(model); }); - filename = data['files'][0]['name']; - that.$fv('name', filename); - that.updateFileUploadMimetype(filename); - that.viewmodel(model); - return data.submit().success(function(uri) { - var save; - model.set({ - uri: uri - }, { - silent: true - }); - save = model.save(); - save.done(function(data) { - model.id = data.asset_id; - _.extend(model.attributes, data); - return model.collection.add(model); - }); - return save.fail(function() { - return model.destroy(); - }); - }).error(function() { + return save.fail(function() { return model.destroy(); }); - }, - stop: function(e) { - (that.$('.progress')).hide(); - return (that.$('.progress .bar')).css('width', "0"); - }, - done: function(e, data) { - (that.$('.status')).show(); - (that.$('.status')).html('Upload completed.'); - return setTimeout(function() { - return (that.$('.status')).fadeOut('slow'); - }, 5000); - } - }); - } - return false; + }).error(function() { + return model.destroy(); + }); + }, + stop: function(e) { + (that.$('.progress')).hide(); + return (that.$('.progress .bar')).css('width', "0"); + }, + done: function(e, data) { + (that.$('.status')).show(); + (that.$('.status')).html('Upload completed.'); + return setTimeout(function() { + return (that.$('.status')).fadeOut('slow'); + }, 5000); + } + }); } + return false; + }; - clickTabNavUri(e) { // TODO: clean - boundMethodCheck(this, AddAssetView); - if (!(this.$('#tab-uri')).hasClass('active')) { - (this.$("[name='file_upload']")).fileupload('destroy'); - (this.$('ul.nav-tabs li')).removeClass('active show'); - (this.$('.tab-pane')).removeClass('active'); - (this.$('.tabnav-uri')).addClass('active show'); - (this.$('#tab-uri')).addClass('active'); - (this.$('#save-asset')).show(); - (this.$('.uri')).show(); - (this.$('.skip_asset_check_checkbox')).show(); - (this.$('.status')).hide(); - return (this.$f('uri')).focus(); - } + AddAssetView.prototype.clickTabNavUri = function(e) { + if (!(this.$('#tab-uri')).hasClass('active')) { + (this.$("[name='file_upload']")).fileupload('destroy'); + (this.$('ul.nav-tabs li')).removeClass('active show'); + (this.$('.tab-pane')).removeClass('active'); + (this.$('.tabnav-uri')).addClass('active show'); + (this.$('#tab-uri')).addClass('active'); + (this.$('#save-asset')).show(); + (this.$('.uri')).show(); + (this.$('.skip_asset_check_checkbox')).show(); + (this.$('.status')).hide(); + return (this.$f('uri')).focus(); } + }; - updateUriMimetype() { - boundMethodCheck(this, AddAssetView); - return this.updateMimetype(this.$fv('uri')); - } + AddAssetView.prototype.updateUriMimetype = function() { + return this.updateMimetype(this.$fv('uri')); + }; - updateFileUploadMimetype(filename) { - boundMethodCheck(this, AddAssetView); - return this.updateMimetype(filename); - } + AddAssetView.prototype.updateFileUploadMimetype = function(filename) { + return this.updateMimetype(filename); + }; - updateMimetype(filename) { - var mt; - boundMethodCheck(this, AddAssetView); - mt = getMimetype(filename); - this.$fv('mimetype', mt ? mt : new Asset().defaults()['mimetype']); - return this.change_mimetype(); - } + AddAssetView.prototype.updateMimetype = function(filename) { + var mt; + mt = getMimetype(filename); + this.$fv('mimetype', mt ? mt : new Asset().defaults()['mimetype']); + return this.change_mimetype(); + }; - change(e) { - boundMethodCheck(this, AddAssetView); - this._change || (this._change = _.throttle((() => { - this.validate(); + AddAssetView.prototype.change = function(e) { + this._change || (this._change = _.throttle(((function(_this) { + return function() { + _this.validate(); return true; - }), 500)); - return this._change(...arguments); - } - - validate(e) { - var errors, field, fn, k, len, results, that, v, validators; - boundMethodCheck(this, AddAssetView); - that = this; - validators = { - uri: function(v) { - if (v) { - if (((that.$('#tab-uri')).hasClass('active')) && !url_test(v)) { - return 'please enter a valid URL'; - } - } - } }; - errors = (function() { - var results; - results = []; - for (field in validators) { - fn = validators[field]; - if (v = fn(this.$fv(field))) { - results.push([field, v]); + })(this)), 500)); + return this._change.apply(this, arguments); + }; + + AddAssetView.prototype.validate = function(e) { + var errors, field, fn, k, len, ref, results, that, v, validators; + that = this; + validators = { + uri: function(v) { + if (v) { + if (((that.$('#tab-uri')).hasClass('active')) && !url_test(v)) { + return 'please enter a valid URL'; } } - return results; - }).call(this); - (this.$(".form-group .help-inline.invalid-feedback")).remove(); - (this.$(".form-group .form-control")).removeClass('is-invalid'); - (this.$('[type=submit]')).prop('disabled', false); + } + }; + errors = (function() { + var results; results = []; - for (k = 0, len = errors.length; k < len; k++) { - [field, v] = errors[k]; - (this.$('[type=submit]')).prop('disabled', true); - (this.$(`.form-group.${field} .form-control`)).addClass('is-invalid'); - results.push((this.$(`.form-group.${field} .controls`)).append($(`${v}`))); + for (field in validators) { + fn = validators[field]; + if (v = fn(this.$fv(field))) { + results.push([field, v]); + } } return results; + }).call(this); + (this.$(".form-group .help-inline.invalid-feedback")).remove(); + (this.$(".form-group .form-control")).removeClass('is-invalid'); + (this.$('[type=submit]')).prop('disabled', false); + results = []; + for (k = 0, len = errors.length; k < len; k++) { + ref = errors[k], field = ref[0], v = ref[1]; + (this.$('[type=submit]')).prop('disabled', true); + (this.$(".form-group." + field + " .form-control")).addClass('is-invalid'); + results.push((this.$(".form-group." + field + " .controls")).append($("" + v + ""))); } + return results; + }; - cancel(e) { - boundMethodCheck(this, AddAssetView); - return (this.$el.children(":first")).modal('hide'); - } + AddAssetView.prototype.cancel = function(e) { + return (this.$el.children(":first")).modal('hide'); + }; - destroyFileUploadWidget(e) { - boundMethodCheck(this, AddAssetView); - if ((this.$('#tab-file_upload')).hasClass('active')) { - return (this.$("[name='file_upload']")).fileupload('destroy'); - } + AddAssetView.prototype.destroyFileUploadWidget = function(e) { + if ((this.$('#tab-file_upload')).hasClass('active')) { + return (this.$("[name='file_upload']")).fileupload('destroy'); } + }; + return AddAssetView; + + })(Backbone.View); + + API.View.EditAssetView = EditAssetView = (function(superClass) { + extend(EditAssetView, superClass); + + function EditAssetView() { + this.setDisabledDatepicker = bind(this.setDisabledDatepicker, this); + this.setLoopDateTime = bind(this.setLoopDateTime, this); + this.displayAdvanced = bind(this.displayAdvanced, this); + this.toggleAdvanced = bind(this.toggleAdvanced, this); + this.cancel = bind(this.cancel, this); + this.validate = bind(this.validate, this); + this.change = bind(this.change, this); + this.save = bind(this.save, this); + this.changeLoopTimes = bind(this.changeLoopTimes, this); + this.viewmodel = bind(this.viewmodel, this); + this.render = bind(this.render, this); + this.initialize = bind(this.initialize, this); + this.$fv = bind(this.$fv, this); + this.$f = bind(this.$f, this); + return EditAssetView.__super__.constructor.apply(this, arguments); + } + + EditAssetView.prototype.$f = function(field) { + return this.$("[name='" + field + "']"); }; - AddAssetView.prototype.events = { - 'change': 'change', - 'click #save-asset': 'save', - 'click .cancel': 'cancel', - 'hidden.bs.modal': 'destroyFileUploadWidget', - 'click .tabnav-uri': 'clickTabNavUri', - 'click .tabnav-file_upload': 'clickTabNavUpload', - 'change .is_enabled-skip_asset_check_checkbox': 'toggleSkipAssetCheck' + EditAssetView.prototype.$fv = function() { + var field, ref, val; + field = arguments[0], val = 2 <= arguments.length ? slice.call(arguments, 1) : []; + return (ref = this.$f(field)).val.apply(ref, val); }; - return AddAssetView; + EditAssetView.prototype.initialize = function(options) { + ($('body')).append(this.$el.html(get_template('asset-modal'))); + (this.$('input.time')).timepicker({ + minuteStep: 5, + showInputs: true, + disableFocus: true, + showMeridian: dateSettings.showMeridian + }); + (this.$('input[name="nocache"]')).prop('checked', this.model.get('nocache')); + (this.$('.modal-header .close')).remove(); + (this.$el.children(":first")).modal(); + this.model.backup(); + this.model.bind('change', this.render); + this.render(); + this.validate(); + return false; + }; - }).call(this); - - API.View.EditAssetView = EditAssetView = (function() { - class EditAssetView extends Backbone.View { - constructor() { - super(...arguments); - this.$f = this.$f.bind(this); - this.$fv = this.$fv.bind(this); - this.initialize = this.initialize.bind(this); - this.render = this.render.bind(this); - this.viewmodel = this.viewmodel.bind(this); - this.changeLoopTimes = this.changeLoopTimes.bind(this); - this.save = this.save.bind(this); - this.change = this.change.bind(this); - this.validate = this.validate.bind(this); - this.cancel = this.cancel.bind(this); - this.toggleAdvanced = this.toggleAdvanced.bind(this); - this.displayAdvanced = this.displayAdvanced.bind(this); - this.setLoopDateTime = this.setLoopDateTime.bind(this); - this.setDisabledDatepicker = this.setDisabledDatepicker.bind(this); + EditAssetView.prototype.render = function() { + var d, f, field, k, l, len, len1, len2, m, ref, ref1, ref2, which; + this.undelegateEvents(); + ref = 'mimetype uri file_upload'.split(' '); + for (k = 0, len = ref.length; k < len; k++) { + f = ref[k]; + (this.$(f)).attr('disabled', true); } - - $f(field) { - boundMethodCheck(this, EditAssetView); - return this.$(`[name='${field}']`); + (this.$('#modalLabel')).text("Edit Asset"); + (this.$('.asset-location')).hide(); + (this.$('.uri')).hide(); + (this.$('.skip_asset_check_checkbox')).hide(); + (this.$('.asset-location.edit')).show(); + (this.$('.mime-select')).prop('disabled', 'true'); + if ((this.model.get('mimetype')) === 'video') { + (this.$f('duration')).prop('disabled', true); } - - $fv(field, ...val) { - boundMethodCheck(this, EditAssetView); - return (this.$f(field)).val(...val); // get or set filed value + ref1 = this.model.fields; + for (l = 0, len1 = ref1.length; l < len1; l++) { + field = ref1[l]; + if ((this.$fv(field)) !== this.model.get(field)) { + this.$fv(field, this.model.get(field)); + } } - - initialize(options) { - boundMethodCheck(this, EditAssetView); - ($('body')).append(this.$el.html(get_template('asset-modal'))); - (this.$('input.time')).timepicker({ - minuteStep: 5, - showInputs: true, - disableFocus: true, - showMeridian: dateSettings.showMeridian + (this.$('.uri-text')).html(insertWbr(truncate_str(this.model.get('uri')))); + ref2 = ['start', 'end']; + for (m = 0, len2 = ref2.length; m < len2; m++) { + which = ref2[m]; + d = date_to(this.model.get(which + "_date")); + this.$fv(which + "_date_date", d.date()); + (this.$f(which + "_date_date")).datepicker({ + autoclose: true, + format: dateSettings.datepickerFormat }); - (this.$('input[name="nocache"]')).prop('checked', this.model.get('nocache')); - (this.$('.modal-header .close')).remove(); - (this.$el.children(":first")).modal(); - this.model.backup(); - this.model.bind('change', this.render); - this.render(); - this.validate(); - return false; + (this.$f(which + "_date_date")).datepicker('setValue', d.date()); + this.$fv(which + "_date_time", d.time()); } + this.displayAdvanced(); + this.delegateEvents(); + return false; + }; - render() { - var d, f, field, k, l, len, len1, len2, m, ref, ref1, ref2, which; - boundMethodCheck(this, EditAssetView); - this.undelegateEvents(); - ref = 'mimetype uri file_upload'.split(' '); - for (k = 0, len = ref.length; k < len; k++) { - f = ref[k]; - (this.$(f)).attr('disabled', true); - } - (this.$('#modalLabel')).text("Edit Asset"); - (this.$('.asset-location')).hide(); - (this.$('.uri')).hide(); - (this.$('.skip_asset_check_checkbox')).hide(); - (this.$('.asset-location.edit')).show(); - (this.$('.mime-select')).prop('disabled', 'true'); - if ((this.model.get('mimetype')) === 'video') { - (this.$f('duration')).prop('disabled', true); - } - ref1 = this.model.fields; - for (l = 0, len1 = ref1.length; l < len1; l++) { - field = ref1[l]; - if ((this.$fv(field)) !== this.model.get(field)) { - this.$fv(field, this.model.get(field)); - } - } - (this.$('.uri-text')).html(insertWbr(truncate_str(this.model.get('uri')))); - ref2 = ['start', 'end']; - for (m = 0, len2 = ref2.length; m < len2; m++) { - which = ref2[m]; - d = date_to(this.model.get(`${which}_date`)); - this.$fv(`${which}_date_date`, d.date()); - (this.$f(`${which}_date_date`)).datepicker({ - autoclose: true, - format: dateSettings.datepickerFormat - }); - (this.$f(`${which}_date_date`)).datepicker('setValue', d.date()); - this.$fv(`${which}_date_time`, d.time()); - } - this.displayAdvanced(); - this.delegateEvents(); - return false; + EditAssetView.prototype.viewmodel = function() { + var field, k, l, len, len1, ref, ref1, results, which; + ref = ['start', 'end']; + for (k = 0, len = ref.length; k < len; k++) { + which = ref[k]; + this.$fv(which + "_date", (moment((this.$fv(which + "_date_date")) + " " + (this.$fv(which + "_date_time")), dateSettings.fullDate)).toDate().toISOString()); } - - viewmodel() { - var field, k, l, len, len1, ref, ref1, results, which; - boundMethodCheck(this, EditAssetView); - ref = ['start', 'end']; - for (k = 0, len = ref.length; k < len; k++) { - which = ref[k]; - this.$fv(`${which}_date`, (moment((this.$fv(`${which}_date_date`)) + " " + (this.$fv(`${which}_date_time`)), dateSettings.fullDate)).toDate().toISOString()); - } - ref1 = this.model.fields; - results = []; - for (l = 0, len1 = ref1.length; l < len1; l++) { - field = ref1[l]; - if (!(this.$f(field)).prop('disabled')) { - results.push(this.model.set(field, this.$fv(field), { - silent: true - })); - } + ref1 = this.model.fields; + results = []; + for (l = 0, len1 = ref1.length; l < len1; l++) { + field = ref1[l]; + if (!(this.$f(field)).prop('disabled')) { + results.push(this.model.set(field, this.$fv(field), { + silent: true + })); } - return results; } + return results; + }; - changeLoopTimes() { - var current_date, end_date; - boundMethodCheck(this, EditAssetView); - current_date = new Date(); - end_date = new Date(); - switch (this.$('#loop_times').val()) { - case "day": - this.setLoopDateTime(date_to(current_date), date_to(end_date.setDate(current_date.getDate() + 1))); - break; - case "week": - this.setLoopDateTime(date_to(current_date), date_to(end_date.setDate(current_date.getDate() + 7))); - break; - case "month": - this.setLoopDateTime(date_to(current_date), date_to(end_date.setMonth(current_date.getMonth() + 1))); - break; - case "year": - this.setLoopDateTime(date_to(current_date), date_to(end_date.setFullYear(current_date.getFullYear() + 1))); - break; - case "forever": - this.setLoopDateTime(date_to(current_date), date_to(end_date.setFullYear(9999))); - break; - case "manual": - this.setDisabledDatepicker(false); - (this.$("#manul_date")).show(); - return; - default: - return; - } - this.setDisabledDatepicker(true); - return (this.$("#manul_date")).hide(); + EditAssetView.prototype.events = { + 'click #save-asset': 'save', + 'click .cancel': 'cancel', + 'change': 'change', + 'keyup': 'change', + 'click .advanced-toggle': 'toggleAdvanced' + }; + + EditAssetView.prototype.changeLoopTimes = function() { + var current_date, end_date; + current_date = new Date(); + end_date = new Date(); + switch (this.$('#loop_times').val()) { + case "day": + this.setLoopDateTime(date_to(current_date), date_to(end_date.setDate(current_date.getDate() + 1))); + break; + case "week": + this.setLoopDateTime(date_to(current_date), date_to(end_date.setDate(current_date.getDate() + 7))); + break; + case "month": + this.setLoopDateTime(date_to(current_date), date_to(end_date.setMonth(current_date.getMonth() + 1))); + break; + case "year": + this.setLoopDateTime(date_to(current_date), date_to(end_date.setFullYear(current_date.getFullYear() + 1))); + break; + case "forever": + this.setLoopDateTime(date_to(current_date), date_to(end_date.setFullYear(9999))); + break; + case "manual": + this.setDisabledDatepicker(false); + (this.$("#manul_date")).show(); + return; + default: + return; } + this.setDisabledDatepicker(true); + return (this.$("#manul_date")).hide(); + }; - save(e) { - var save; - boundMethodCheck(this, EditAssetView); - this.viewmodel(); - save = null; - this.model.set('nocache', (this.$('input[name="nocache"]')).prop('checked') ? 1 : 0); - if (!this.model.get('name')) { - if (this.model.old_name()) { - this.model.set({ - name: this.model.old_name() - }, { - silent: true - }); - } else if (getMimetype(this.model.get('uri'))) { - this.model.set({ - name: get_filename(this.model.get('uri')) - }, { - silent: true - }); - } else { - this.model.set({ - name: this.model.get('uri') - }, { - silent: true - }); - } + EditAssetView.prototype.save = function(e) { + var save; + this.viewmodel(); + save = null; + this.model.set('nocache', (this.$('input[name="nocache"]')).prop('checked') ? 1 : 0); + if (!this.model.get('name')) { + if (this.model.old_name()) { + this.model.set({ + name: this.model.old_name() + }, { + silent: true + }); + } else if (getMimetype(this.model.get('uri'))) { + this.model.set({ + name: get_filename(this.model.get('uri')) + }, { + silent: true + }); + } else { + this.model.set({ + name: this.model.get('uri') + }, { + silent: true + }); } - save = this.model.save(); - (this.$('input, select')).prop('disabled', true); - save.done((data) => { - this.model.id = data.asset_id; - if (!this.model.collection) { - this.collection.add(this.model); - } - (this.$el.children(":first")).modal('hide'); - return _.extend(this.model.attributes, data); - }); - save.fail(() => { - (this.$('.progress')).hide(); - return (this.$('input, select')).prop('disabled', false); - }); - return false; } + save = this.model.save(); + (this.$('input, select')).prop('disabled', true); + save.done((function(_this) { + return function(data) { + _this.model.id = data.asset_id; + if (!_this.model.collection) { + _this.collection.add(_this.model); + } + (_this.$el.children(":first")).modal('hide'); + return _.extend(_this.model.attributes, data); + }; + })(this)); + save.fail((function(_this) { + return function() { + (_this.$('.progress')).hide(); + return (_this.$('input, select')).prop('disabled', false); + }; + })(this)); + return false; + }; - change(e) { - boundMethodCheck(this, EditAssetView); - this._change || (this._change = _.throttle((() => { - this.changeLoopTimes(); - this.viewmodel(); - this.model.trigger('change'); - this.validate(e); + EditAssetView.prototype.change = function(e) { + this._change || (this._change = _.throttle(((function(_this) { + return function() { + _this.changeLoopTimes(); + _this.viewmodel(); + _this.model.trigger('change'); + _this.validate(e); return true; - }), 500)); - return this._change(...arguments); - } + }; + })(this)), 500)); + return this._change.apply(this, arguments); + }; - validate(e) { - var errors, field, fn, k, len, results, that, v, validators; - boundMethodCheck(this, EditAssetView); - that = this; - validators = { - duration: (v) => { - if (('video' !== this.model.get('mimetype')) && (!(_.isNumber(v * 1)) || v * 1 < 1)) { + EditAssetView.prototype.validate = function(e) { + var errors, field, fn, k, len, ref, results, that, v, validators; + that = this; + validators = { + duration: (function(_this) { + return function(v) { + if (('video' !== _this.model.get('mimetype')) && (!(_.isNumber(v * 1)) || v * 1 < 1)) { return 'Please enter a valid number.'; } - }, - end_date: (v) => { + }; + })(this), + end_date: (function(_this) { + return function(v) { var end_date, ref, start_date; - if (!((new Date(this.$fv('start_date'))) < (new Date(this.$fv('end_date'))))) { + if (!((new Date(_this.$fv('start_date'))) < (new Date(_this.$fv('end_date'))))) { if (((ref = $(e != null ? e.target : void 0)) != null ? ref.attr("name") : void 0) === "start_date_date") { - start_date = new Date(this.$fv('start_date')); - end_date = new Date(start_date.getTime() + Math.max(parseInt(this.$fv('duration')), 60) * 1000); - this.setLoopDateTime(date_to(start_date), date_to(end_date)); + start_date = new Date(_this.$fv('start_date')); + end_date = new Date(start_date.getTime() + Math.max(parseInt(_this.$fv('duration')), 60) * 1000); + _this.setLoopDateTime(date_to(start_date), date_to(end_date)); return; } return 'End date should be after start date.'; } - } - }; - errors = (function() { - var results; - results = []; - for (field in validators) { - fn = validators[field]; - if (v = fn(this.$fv(field))) { - results.push([field, v]); - } - } - return results; - }).call(this); - (this.$(".form-group .help-inline.invalid-feedback")).remove(); - (this.$(".form-group .form-control")).removeClass('is-invalid'); - (this.$('[type=submit]')).prop('disabled', false); + }; + })(this) + }; + errors = (function() { + var results; results = []; - for (k = 0, len = errors.length; k < len; k++) { - [field, v] = errors[k]; - (this.$('[type=submit]')).prop('disabled', true); - (this.$(`.form-group.${field} .form-control`)).addClass('is-invalid'); - results.push((this.$(`.form-group.${field} .controls`)).append($(`${v}`))); + for (field in validators) { + fn = validators[field]; + if (v = fn(this.$fv(field))) { + results.push([field, v]); + } } return results; + }).call(this); + (this.$(".form-group .help-inline.invalid-feedback")).remove(); + (this.$(".form-group .form-control")).removeClass('is-invalid'); + (this.$('[type=submit]')).prop('disabled', false); + results = []; + for (k = 0, len = errors.length; k < len; k++) { + ref = errors[k], field = ref[0], v = ref[1]; + (this.$('[type=submit]')).prop('disabled', true); + (this.$(".form-group." + field + " .form-control")).addClass('is-invalid'); + results.push((this.$(".form-group." + field + " .controls")).append($("" + v + ""))); } + return results; + }; - cancel(e) { - boundMethodCheck(this, EditAssetView); - this.model.rollback(); - return (this.$el.children(":first")).modal('hide'); - } - - toggleAdvanced() { - boundMethodCheck(this, EditAssetView); - (this.$('.fa-play')).toggleClass('rotated'); - (this.$('.fa-play')).toggleClass('unrotated'); - return (this.$('.collapse-advanced')).collapse('toggle'); - } - - displayAdvanced() { - var edit, has_nocache, img; - boundMethodCheck(this, EditAssetView); - img = 'image' === this.$fv('mimetype'); - edit = url_test(this.model.get('uri')); - has_nocache = img && edit; - return (this.$('.advanced-accordion')).toggle(has_nocache === true); - } + EditAssetView.prototype.cancel = function(e) { + this.model.rollback(); + return (this.$el.children(":first")).modal('hide'); + }; - setLoopDateTime(start_date, end_date) { - boundMethodCheck(this, EditAssetView); - this.$fv("start_date_date", start_date.date()); - (this.$f("start_date_date")).datepicker({ - autoclose: true, - format: dateSettings.datepickerFormat - }); - (this.$f("start_date_date")).datepicker('setDate', moment(start_date.date(), dateSettings.date).toDate()); - this.$fv("start_date_time", start_date.time()); - this.$fv("end_date_date", end_date.date()); - (this.$f("end_date_date")).datepicker({ - autoclose: true, - format: dateSettings.datepickerFormat - }); - (this.$f("end_date_date")).datepicker('setDate', moment(end_date.date(), dateSettings.date).toDate()); - this.$fv("end_date_time", end_date.time()); - (this.$(".form-group .help-inline.invalid-feedback")).remove(); - (this.$(".form-group .form-control")).removeClass('is-invalid'); - return (this.$('[type=submit]')).prop('disabled', false); - } + EditAssetView.prototype.toggleAdvanced = function() { + (this.$('.fa-play')).toggleClass('rotated'); + (this.$('.fa-play')).toggleClass('unrotated'); + return (this.$('.collapse-advanced')).collapse('toggle'); + }; - setDisabledDatepicker(b) { - var k, len, ref, results, which; - boundMethodCheck(this, EditAssetView); - ref = ['start', 'end']; - results = []; - for (k = 0, len = ref.length; k < len; k++) { - which = ref[k]; - (this.$f(`${which}_date_date`)).attr('disabled', b); - results.push((this.$f(`${which}_date_time`)).attr('disabled', b)); - } - return results; - } + EditAssetView.prototype.displayAdvanced = function() { + var edit, has_nocache, img; + img = 'image' === this.$fv('mimetype'); + edit = url_test(this.model.get('uri')); + has_nocache = img && edit; + return (this.$('.advanced-accordion')).toggle(has_nocache === true); + }; + EditAssetView.prototype.setLoopDateTime = function(start_date, end_date) { + this.$fv("start_date_date", start_date.date()); + (this.$f("start_date_date")).datepicker({ + autoclose: true, + format: dateSettings.datepickerFormat + }); + (this.$f("start_date_date")).datepicker('setDate', moment(start_date.date(), dateSettings.date).toDate()); + this.$fv("start_date_time", start_date.time()); + this.$fv("end_date_date", end_date.date()); + (this.$f("end_date_date")).datepicker({ + autoclose: true, + format: dateSettings.datepickerFormat + }); + (this.$f("end_date_date")).datepicker('setDate', moment(end_date.date(), dateSettings.date).toDate()); + this.$fv("end_date_time", end_date.time()); + (this.$(".form-group .help-inline.invalid-feedback")).remove(); + (this.$(".form-group .form-control")).removeClass('is-invalid'); + return (this.$('[type=submit]')).prop('disabled', false); }; - EditAssetView.prototype.events = { - 'click #save-asset': 'save', - 'click .cancel': 'cancel', - 'change': 'change', - 'keyup': 'change', - 'click .advanced-toggle': 'toggleAdvanced' + EditAssetView.prototype.setDisabledDatepicker = function(b) { + var k, len, ref, results, which; + ref = ['start', 'end']; + results = []; + for (k = 0, len = ref.length; k < len; k++) { + which = ref[k]; + (this.$f(which + "_date_date")).attr('disabled', b); + results.push((this.$f(which + "_date_time")).attr('disabled', b)); + } + return results; }; return EditAssetView; - }).call(this); - - API.View.AssetRowView = AssetRowView = (function() { - class AssetRowView extends Backbone.View { - constructor() { - super(...arguments); - this.initialize = this.initialize.bind(this); - this.render = this.render.bind(this); - this.toggleIsEnabled = this.toggleIsEnabled.bind(this); - this.setEnabled = this.setEnabled.bind(this); - this.download = this.download.bind(this); - this.edit = this.edit.bind(this); - this.delete = this.delete.bind(this); - this.showPopover = this.showPopover.bind(this); - this.hidePopover = this.hidePopover.bind(this); - } - - initialize(options) { - boundMethodCheck(this, AssetRowView); - return this.template = get_template('asset-row'); - } + })(Backbone.View); + + API.View.AssetRowView = AssetRowView = (function(superClass) { + extend(AssetRowView, superClass); + + function AssetRowView() { + this.hidePopover = bind(this.hidePopover, this); + this.showPopover = bind(this.showPopover, this); + this["delete"] = bind(this["delete"], this); + this.edit = bind(this.edit, this); + this.download = bind(this.download, this); + this.setEnabled = bind(this.setEnabled, this); + this.toggleIsEnabled = bind(this.toggleIsEnabled, this); + this.render = bind(this.render, this); + this.initialize = bind(this.initialize, this); + return AssetRowView.__super__.constructor.apply(this, arguments); + } - render() { - var json; - boundMethodCheck(this, AssetRowView); - this.$el.html(this.template(_.extend(json = this.model.toJSON(), { - name: insertWbr(truncate_str(json.name)), // word break urls at slashes - duration: durationSecondsToHumanReadable(json.duration), - start_date: (date_to(json.start_date)).string(), - end_date: (date_to(json.end_date)).string() - }))); - this.$el.prop('id', this.model.get('asset_id')); - (this.$(".delete-asset-button")).popover({ - content: get_template('confirm-delete') - }); - (this.$(".toggle input")).prop("checked", this.model.get('is_enabled')); - (this.$(".asset-icon")).addClass((function() { - switch (this.model.get("mimetype")) { - case "video": - return "fas fa-video"; - case "streaming": - return "fas fa-video"; - case "image": - return "far fa-image"; - case "webpage": - return "fas fa-globe-americas"; - default: - return ""; - } - }).call(this)); - if ((this.model.get("is_processing")) === 1) { - (this.$('input, button')).prop('disabled', true); - (this.$(".asset-toggle")).html(get_template('processing-message')); - } - return this.el; - } + AssetRowView.prototype.tagName = "tr"; - toggleIsEnabled(e) { - var save, val; - boundMethodCheck(this, AssetRowView); - val = (1 + this.model.get('is_enabled')) % 2; - this.model.set({ - is_enabled: val - }); - this.setEnabled(false); - save = this.model.save(); - save.done(() => { - return this.setEnabled(true); - }); - save.fail(() => { - this.model.set(this.model.previousAttributes(), { - silent: true // revert changes - }); - this.setEnabled(true); - return this.render(); - }); - return true; - } + AssetRowView.prototype.initialize = function(options) { + return this.template = get_template('asset-row'); + }; - setEnabled(enabled) { - boundMethodCheck(this, AssetRowView); - if (enabled) { - this.$el.removeClass('warning'); - this.delegateEvents(); - return (this.$('input, button')).prop('disabled', false); - } else { - this.hidePopover(); - this.undelegateEvents(); - this.$el.addClass('warning'); - return (this.$('input, button')).prop('disabled', true); + AssetRowView.prototype.render = function() { + var json; + this.$el.html(this.template(_.extend(json = this.model.toJSON(), { + name: insertWbr(truncate_str(json.name)), + duration: durationSecondsToHumanReadable(json.duration), + start_date: (date_to(json.start_date)).string(), + end_date: (date_to(json.end_date)).string() + }))); + this.$el.prop('id', this.model.get('asset_id')); + (this.$(".delete-asset-button")).popover({ + content: get_template('confirm-delete') + }); + (this.$(".toggle input")).prop("checked", this.model.get('is_enabled')); + (this.$(".asset-icon")).addClass((function() { + switch (this.model.get("mimetype")) { + case "video": + return "fas fa-video"; + case "streaming": + return "fas fa-video"; + case "image": + return "far fa-image"; + case "webpage": + return "fas fa-globe-americas"; + default: + return ""; } + }).call(this)); + if ((this.model.get("is_processing")) === 1) { + (this.$('input, button')).prop('disabled', true); + (this.$(".asset-toggle")).html(get_template('processing-message')); } + return this.el; + }; - download(e) { - var r; - boundMethodCheck(this, AssetRowView); - r = $.get('/api/v1/assets/' + this.model.id + '/content').success(function(result) { - var a, blob, content, fn, mimetype, url; - switch (result['type']) { - case 'url': - return window.open(result['url']); - case 'file': - content = base64js.toByteArray(result['content']); - mimetype = result['mimetype']; - fn = result['filename']; - blob = new Blob([content], { - type: mimetype - }); - url = URL.createObjectURL(blob); - a = document.createElement('a'); - document.body.appendChild(a); - a.download = fn; - a.href = url; - a.click(); - URL.revokeObjectURL(url); - return a.remove(); - } - }); - return false; - } + AssetRowView.prototype.events = { + 'change .is_enabled-toggle input': 'toggleIsEnabled', + 'click .download-asset-button': 'download', + 'click .edit-asset-button': 'edit', + 'click .delete-asset-button': 'showPopover' + }; - edit(e) { - boundMethodCheck(this, AssetRowView); - new EditAssetView({ - model: this.model - }); - return false; - } + AssetRowView.prototype.toggleIsEnabled = function(e) { + var save, val; + val = (1 + this.model.get('is_enabled')) % 2; + this.model.set({ + is_enabled: val + }); + this.setEnabled(false); + save = this.model.save(); + save.done((function(_this) { + return function() { + return _this.setEnabled(true); + }; + })(this)); + save.fail((function(_this) { + return function() { + _this.model.set(_this.model.previousAttributes(), { + silent: true + }); + _this.setEnabled(true); + return _this.render(); + }; + })(this)); + return true; + }; - delete(e) { - var xhr; - boundMethodCheck(this, AssetRowView); + AssetRowView.prototype.setEnabled = function(enabled) { + if (enabled) { + this.$el.removeClass('warning'); + this.delegateEvents(); + return (this.$('input, button')).prop('disabled', false); + } else { this.hidePopover(); - if ((xhr = this.model.destroy()) === !false) { - xhr.done(() => { - return this.remove(); - }); - } else { - this.remove(); - } - return false; + this.undelegateEvents(); + this.$el.addClass('warning'); + return (this.$('input, button')).prop('disabled', true); } + }; - showPopover() { - boundMethodCheck(this, AssetRowView); - if (!($('.popover')).length) { - (this.$(".delete-asset-button")).popover('show'); - ($('.confirm-delete')).click(this.delete); - ($(window)).one('click', this.hidePopover); + AssetRowView.prototype.download = function(e) { + var r; + r = $.get('/api/v1/assets/' + this.model.id + '/content').success(function(result) { + var a, blob, content, fn, mimetype, url; + switch (result['type']) { + case 'url': + return window.open(result['url']); + case 'file': + content = base64js.toByteArray(result['content']); + mimetype = result['mimetype']; + fn = result['filename']; + blob = new Blob([content], { + type: mimetype + }); + url = URL.createObjectURL(blob); + a = document.createElement('a'); + document.body.appendChild(a); + a.download = fn; + a.href = url; + a.click(); + URL.revokeObjectURL(url); + return a.remove(); } - return false; - } + }); + return false; + }; - hidePopover() { - boundMethodCheck(this, AssetRowView); - (this.$(".delete-asset-button")).popover('hide'); - return false; - } + AssetRowView.prototype.edit = function(e) { + new EditAssetView({ + model: this.model + }); + return false; + }; + AssetRowView.prototype["delete"] = function(e) { + var xhr; + this.hidePopover(); + if ((xhr = this.model.destroy()) === !false) { + xhr.done((function(_this) { + return function() { + return _this.remove(); + }; + })(this)); + } else { + this.remove(); + } + return false; }; - AssetRowView.prototype.tagName = "tr"; + AssetRowView.prototype.showPopover = function() { + if (!($('.popover')).length) { + (this.$(".delete-asset-button")).popover('show'); + ($('.confirm-delete')).click(this["delete"]); + ($(window)).one('click', this.hidePopover); + } + return false; + }; - AssetRowView.prototype.events = { - 'change .is_enabled-toggle input': 'toggleIsEnabled', - 'click .download-asset-button': 'download', - 'click .edit-asset-button': 'edit', - 'click .delete-asset-button': 'showPopover' + AssetRowView.prototype.hidePopover = function() { + (this.$(".delete-asset-button")).popover('hide'); + return false; }; return AssetRowView; - }).call(this); + })(Backbone.View); + + API.View.AssetsView = AssetsView = (function(superClass) { + extend(AssetsView, superClass); - API.View.AssetsView = AssetsView = class AssetsView extends Backbone.View { - constructor() { - super(...arguments); - this.initialize = this.initialize.bind(this); - this.update_order = this.update_order.bind(this); - this.render = this.render.bind(this); + function AssetsView() { + this.render = bind(this.render, this); + this.update_order = bind(this.update_order, this); + this.initialize = bind(this.initialize, this); + return AssetsView.__super__.constructor.apply(this, arguments); } - initialize(options) { + AssetsView.prototype.initialize = function(options) { var event, k, len, ref; - boundMethodCheck(this, AssetsView); ref = 'reset add remove sync'.split(' '); for (k = 0, len = ref.length; k < len; k++) { event = ref[k]; @@ -1024,11 +1010,10 @@ helper: 'clone', update: this.update_order }); - } + }; - update_order() { + AssetsView.prototype.update_order = function() { var active, el, i, id, k, l, len, len1, ref; - boundMethodCheck(this, AssetsView); active = (this.$('#active-assets')).sortable('toArray'); for (i = k = 0, len = active.length; k < len; i = ++k) { id = active[i]; @@ -1042,112 +1027,100 @@ return $.post('/api/v1/assets/order', { ids: ((this.$('#active-assets')).sortable('toArray')).join(',') }); - } + }; - render() { + AssetsView.prototype.render = function() { var k, l, len, len1, len2, m, ref, ref1, ref2, which; - boundMethodCheck(this, AssetsView); this.collection.sort(); ref = ['active', 'inactive']; for (k = 0, len = ref.length; k < len; k++) { which = ref[k]; - (this.$(`#${which}-assets`)).html(''); + (this.$("#" + which + "-assets")).html(''); } - this.collection.each((model) => { - which = model.active() ? 'active' : 'inactive'; - return (this.$(`#${which}-assets`)).append((new AssetRowView({ - model: model - })).render()); - }); + this.collection.each((function(_this) { + return function(model) { + which = model.active() ? 'active' : 'inactive'; + return (_this.$("#" + which + "-assets")).append((new AssetRowView({ + model: model + })).render()); + }; + })(this)); ref1 = ['active', 'inactive']; for (l = 0, len1 = ref1.length; l < len1; l++) { which = ref1[l]; - if ((this.$(`#${which}-assets tr`)).length === 0) { - (this.$(`#${which}-assets-section .table-assets-help-text`)).show(); + if ((this.$("#" + which + "-assets tr")).length === 0) { + (this.$("#" + which + "-assets-section .table-assets-help-text")).show(); } else { - (this.$(`#${which}-assets-section .table-assets-help-text`)).hide(); + (this.$("#" + which + "-assets-section .table-assets-help-text")).hide(); } } ref2 = ['inactive', 'active']; for (m = 0, len2 = ref2.length; m < len2; m++) { which = ref2[m]; - this.$(`.${which}-table thead`).toggle(!!(this.$(`#${which}-assets tr`).length)); + this.$("." + which + "-table thead").toggle(!!(this.$("#" + which + "-assets tr").length)); } this.update_order(); return this.el; - } + }; - }; + return AssetsView; - API.App = App = (function() { - class App extends Backbone.View { - constructor() { - super(...arguments); - this.initialize = this.initialize.bind(this); - } + })(Backbone.View); - initialize() { - var address, error, k, len, results, ws; - boundMethodCheck(this, App); - ($(window)).ajaxError(function(e, r) { - var err, j; - ($('#request-error')).html((get_template('request-error'))()); - if ((j = $.parseJSON(r.responseText)) && (err = j.error)) { - ($('#request-error .msg')).text('Server Error: ' + err); - } + API.App = App = (function(superClass) { + extend(App, superClass); + + function App() { + this.initialize = bind(this.initialize, this); + return App.__super__.constructor.apply(this, arguments); + } + + App.prototype.initialize = function() { + var address, error, k, len, results, ws; + ($(window)).ajaxError(function(e, r) { + var err, j; + ($('#request-error')).html((get_template('request-error'))()); + if ((j = $.parseJSON(r.responseText)) && (err = j.error)) { + ($('#request-error .msg')).text('Server Error: ' + err); + } + ($('#request-error')).show(); + return setTimeout(function() { + return ($('#request-error')).fadeOut('slow'); + }, 5000); + }); + ($(window)).ajaxSuccess(function(event, request, settings) { + if ((settings.url === new Assets().url) && (settings.type === 'POST')) { + ($('#request-error')).html((get_template('request-success'))()); + ($('#request-error .msg')).text('Asset has been successfully uploaded.'); ($('#request-error')).show(); return setTimeout(function() { return ($('#request-error')).fadeOut('slow'); }, 5000); - }); - ($(window)).ajaxSuccess(function(event, request, settings) { - if ((settings.url === new Assets().url) && (settings.type === 'POST')) { - ($('#request-error')).html((get_template('request-success'))()); - ($('#request-error .msg')).text('Asset has been successfully uploaded.'); - ($('#request-error')).show(); - return setTimeout(function() { - return ($('#request-error')).fadeOut('slow'); - }, 5000); - } - }); - (API.assets = new Assets()).fetch(); - API.assetsView = new AssetsView({ - collection: API.assets, - el: this.$('#assets') - }); - results = []; - for (k = 0, len = wsAddresses.length; k < len; k++) { - address = wsAddresses[k]; - try { - ws = new WebSocket(address); - results.push(ws.onmessage = function(x) { - var model, save; - model = API.assets.get(x.data); - if (model) { - return save = model.fetch(); - } - }); - } catch (error1) { - error = error1; - results.push(false); - } } - return results; - } - - add(e) { - new AddAssetView(); - return false; - } - - previous(e) { - return $.get('/api/v1/assets/control/previous'); - } - - next(e) { - return $.get('/api/v1/assets/control/next'); + }); + (API.assets = new Assets()).fetch(); + API.assetsView = new AssetsView({ + collection: API.assets, + el: this.$('#assets') + }); + results = []; + for (k = 0, len = wsAddresses.length; k < len; k++) { + address = wsAddresses[k]; + try { + ws = new WebSocket(address); + results.push(ws.onmessage = function(x) { + var model, save; + model = API.assets.get(x.data); + if (model) { + return save = model.fetch(); + } + }); + } catch (error1) { + error = error1; + results.push(false); + } } - + return results; }; App.prototype.events = { @@ -1156,9 +1129,22 @@ 'click #next-asset-button': 'next' }; + App.prototype.add = function(e) { + new AddAssetView; + return false; + }; + + App.prototype.previous = function(e) { + return $.get('/api/v1/assets/control/previous'); + }; + + App.prototype.next = function(e) { + return $.get('/api/v1/assets/control/next'); + }; + return App; - }).call(this); + })(Backbone.View); }).call(this); diff --git a/static/js/screenly-ose.js.map b/static/js/screenly-ose.js.map index 438dddd71..4662dc79a 100644 --- a/static/js/screenly-ose.js.map +++ b/static/js/screenly-ose.js.map @@ -6,8 +6,5 @@ "screenly-ose.coffee" ], "names": [], - "mappings": "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", - "sourcesContent": [ - "### screenly-ose ui ###\n\n$().ready ->\n $('#subsribe-form-container').popover content: get_template 'subscribe-form'\n\n\nAPI = (window.Screenly ||= {}) # exports\n\ndateSettings = {}\n\nif use24HourClock\n dateSettings.time = \"HH:mm\"\n dateSettings.fullTime = \"HH:mm:ss\"\n dateSettings.showMeridian = false\nelse\n dateSettings.time = \"hh:mm A\"\n dateSettings.fullTime = \"hh:mm:ss A\"\n dateSettings.showMeridian = true\n\ndateSettings.date = dateFormat.toUpperCase()\ndateSettings.datepickerFormat = dateFormat\n\ndateSettings.fullDate = \"#{dateSettings.date} #{dateSettings.fullTime}\"\n\n\nAPI.date_to = date_to = (d) ->\n # Cross-browser UTC to localtime conversion\n dd = moment.utc(d).local()\n string: -> dd.format dateSettings.fullDate\n date: -> dd.format dateSettings.date\n time: -> dd.format dateSettings.time\n\nnow = -> new Date()\n\nget_template = (name) -> _.template ($ \"##{name}-template\").html()\ndelay = (wait, fn) -> _.delay fn, wait\n\nmimetypes = [ [('jpg jpeg png pnm gif bmp'.split ' '), 'image']\n [('avi mkv mov mpg mpeg mp4 ts flv'.split ' '), 'video']]\nviduris = ('rtsp rtmp'.split ' ')\ndomains = [ [('www.youtube.com youtu.be'.split ' '), 'youtube_asset']]\n\n\ngetMimetype = (filename) ->\n scheme = (_.first filename.split ':').toLowerCase()\n match = scheme in viduris\n if match\n return 'streaming'\n\n domain = (_.first ((_.last filename.split '//').toLowerCase()).split '/')\n mt = _.find domains, (mt) -> domain in mt[0]\n if mt and domain in mt[0]\n return mt[1]\n\n ext = (_.last filename.split '.').toLowerCase()\n mt = _.find mimetypes, (mt) -> ext in mt[0]\n if mt\n return mt[1]\n\ndurationSecondsToHumanReadable = (secs) ->\n durationString = \"\"\n secInt = parseInt(secs)\n\n if ((hours = Math.floor(secInt / 3600)) > 0)\n durationString += hours + \" hours \"\n if ((minutes = Math.floor(secInt / 60) % 60) > 0)\n durationString += minutes + \" min \"\n if ((seconds = (secInt % 60)) > 0)\n durationString += seconds + \" sec\"\n\n return durationString\n\nurl_test = (v) -> /(http|https|rtsp|rtmp):\\/\\/[\\w-]+(\\.?[\\w-]+)+([\\w.,@?^=%&:\\/~+#-]*[\\w@?^=%&\\/~+#-])?/.test v\nget_filename = (v) -> (v.replace /[\\/\\\\\\s]+$/g, '').replace /^.*[\\\\\\/]/g, ''\ntruncate_str = (v) -> v.replace /(.{100})..+/, \"$1...\"\ninsertWbr = (v) -> (v.replace /\\//g, '/').replace /\\&/g, '&'\n\n# Tell Backbone to send its saves as JSON-encoded.\nBackbone.emulateJSON = off\n\n# Models\nAPI.Asset = class Asset extends Backbone.Model\n idAttribute: \"asset_id\"\n fields: 'name mimetype uri start_date end_date duration skip_asset_check'.split ' '\n defaults: ->\n name: ''\n mimetype: 'webpage'\n uri: ''\n is_active: 1\n start_date: ''\n end_date: ''\n duration: defaultDuration\n is_enabled: 0\n is_processing: 0\n nocache: 0\n play_order: 0\n skip_asset_check: 0\n active: =>\n if @get('is_enabled') and @get('start_date') and @get('end_date')\n at = now()\n start_date = new Date(@get('start_date'));\n end_date = new Date(@get('end_date'));\n return start_date <= at <= end_date\n else\n return false\n\n backup: =>\n @backup_attributes = @toJSON()\n\n rollback: =>\n if @backup_attributes\n @set @backup_attributes\n @backup_attributes = undefined\n old_name: =>\n if @backup_attributes\n return @backup_attributes.name\n\n\nAPI.Assets = class Assets extends Backbone.Collection\n url: \"/api/v1.2/assets\"\n model: Asset\n comparator: 'play_order'\n\n\n# Views\nAPI.View = {};\n\nAPI.View.AddAssetView = class AddAssetView extends Backbone.View\n $f: (field) => @$ \"[name='#{field}']\" # get field element\n $fv: (field, val...) => (@$f field).val val... # get or set filed value\n\n initialize: (oprions) =>\n ($ 'body').append @$el.html get_template 'asset-modal'\n (@$el.children \":first\").modal()\n (@$ '.cancel').val 'Back to Assets'\n\n deadlines = start: now(), end: (moment().add 'days', 30).toDate()\n for own tag, deadline of deadlines\n d = date_to deadline\n @.$fv \"#{tag}_date_date\", d.date()\n @.$fv \"#{tag}_date_time\", d.time()\n\n no\n\n viewmodel:(model) =>\n for which in ['start', 'end']\n @$fv \"#{which}_date\", (moment (@$fv \"#{which}_date_date\") + \" \" + (@$fv \"#{which}_date_time\"), dateSettings.fullDate).toDate().toISOString()\n for field in model.fields when not (@$f field).prop 'disabled'\n model.set field, (@$fv field), silent:yes\n\n events:\n 'change': 'change'\n 'click #save-asset': 'save'\n 'click .cancel': 'cancel'\n 'hidden.bs.modal': 'destroyFileUploadWidget'\n 'click .tabnav-uri': 'clickTabNavUri'\n 'click .tabnav-file_upload': 'clickTabNavUpload'\n 'change .is_enabled-skip_asset_check_checkbox': 'toggleSkipAssetCheck'\n\n save: (e) =>\n if ((@$fv 'uri') == '')\n return no\n if (@$ '#tab-uri').hasClass 'active'\n model = new Asset {}, {collection: API.assets}\n @$fv 'mimetype', ''\n @updateUriMimetype()\n @viewmodel model\n model.set {name: model.get 'uri'}, silent:yes\n save = model.save()\n\n (@$ 'input').prop 'disabled', on\n save.done (data) =>\n model.id = data.asset_id\n (@$el.children \":first\").modal 'hide'\n _.extend model.attributes, data\n model.collection.add model\n save.fail =>\n (@$ 'input').prop 'disabled', off\n model.destroy()\n no\n\n toggleSkipAssetCheck: (e) =>\n @$fv 'skip_asset_check', if parseInt((@$fv 'skip_asset_check')) == 1 then 0 else 1\n\n change_mimetype: =>\n if (@$fv 'mimetype') == \"video\"\n @$fv 'duration', 0\n else if (@$fv 'mimetype') == \"streaming\"\n @$fv 'duration', defaultStreamingDuration\n else\n @$fv 'duration', defaultDuration\n\n clickTabNavUpload: (e) =>\n if not (@$ '#tab-file_upload').hasClass 'active'\n (@$ 'ul.nav-tabs li').removeClass 'active show'\n (@$ '.tab-pane').removeClass 'active'\n (@$ '.tabnav-file_upload').addClass 'active show'\n (@$ '#tab-file_upload').addClass 'active'\n (@$ '.uri').hide()\n (@$ '.skip_asset_check_checkbox').hide()\n (@$ '#save-asset').hide()\n that = this\n (@$ \"[name='file_upload']\").fileupload\n autoUpload: false\n sequentialUploads: true\n maxChunkSize: 5000000 #5 MB\n url: 'api/v1/file_asset'\n progressall: (e, data) => if data.loaded and data.total\n (@$ '.progress .bar').css 'width', \"#{data.loaded / data.total * 100}%\"\n add: (e, data) ->\n (that.$ '.status').hide()\n (that.$ '.progress').show()\n\n model = new Asset {}, {collection: API.assets}\n filename = data['files'][0]['name']\n that.$fv 'name', filename\n that.updateFileUploadMimetype(filename)\n that.viewmodel model\n\n data.submit()\n .success (uri) ->\n model.set {uri: uri}, silent:yes\n\n save = model.save()\n save.done (data) ->\n model.id = data.asset_id\n _.extend model.attributes, data\n model.collection.add model\n save.fail ->\n model.destroy()\n .error ->\n model.destroy()\n stop: (e) ->\n (that.$ '.progress').hide()\n (that.$ '.progress .bar').css 'width', \"0\"\n done: (e, data) ->\n (that.$ '.status').show()\n (that.$ '.status').html 'Upload completed.'\n setTimeout ->\n (that.$ '.status').fadeOut('slow')\n , 5000\n no\n\n clickTabNavUri: (e) => # TODO: clean\n if not (@$ '#tab-uri').hasClass 'active'\n (@$ \"[name='file_upload']\").fileupload 'destroy'\n (@$ 'ul.nav-tabs li').removeClass 'active show'\n (@$ '.tab-pane').removeClass 'active'\n (@$ '.tabnav-uri').addClass 'active show'\n (@$ '#tab-uri').addClass 'active'\n (@$ '#save-asset').show()\n (@$ '.uri').show()\n (@$ '.skip_asset_check_checkbox').show()\n (@$ '.status').hide()\n (@$f 'uri').focus()\n\n updateUriMimetype: => @updateMimetype @$fv 'uri'\n updateFileUploadMimetype: (filename) => @updateMimetype filename\n updateMimetype: (filename) =>\n mt = getMimetype filename\n @$fv 'mimetype', if mt then mt else new Asset().defaults()['mimetype']\n @change_mimetype()\n\n change: (e) =>\n @_change ||= _.throttle (=>\n @validate()\n yes), 500\n @_change arguments...\n\n validate: (e) =>\n that = this\n validators =\n uri: (v) ->\n if v\n if ((that.$ '#tab-uri').hasClass 'active') and not url_test v\n 'please enter a valid URL'\n errors = ([field, v] for field, fn of validators when v = fn (@$fv field))\n\n (@$ \".form-group .help-inline.invalid-feedback\").remove()\n (@$ \".form-group .form-control\").removeClass 'is-invalid'\n (@$ '[type=submit]').prop 'disabled', no\n for [field, v] in errors\n (@$ '[type=submit]').prop 'disabled', yes\n (@$ \".form-group.#{field} .form-control\").addClass 'is-invalid'\n (@$ \".form-group.#{field} .controls\").append \\\n $ (\"#{v}\")\n\n cancel: (e) =>\n (@$el.children \":first\").modal 'hide'\n\n destroyFileUploadWidget: (e) =>\n if (@$ '#tab-file_upload').hasClass 'active'\n (@$ \"[name='file_upload']\").fileupload 'destroy'\n\n\nAPI.View.EditAssetView = class EditAssetView extends Backbone.View\n $f: (field) => @$ \"[name='#{field}']\" # get field element\n $fv: (field, val...) => (@$f field).val val... # get or set filed value\n\n initialize: (options) =>\n ($ 'body').append @$el.html get_template 'asset-modal'\n (@$ 'input.time').timepicker\n minuteStep: 5, showInputs: yes, disableFocus: yes, showMeridian: dateSettings.showMeridian\n\n (@$ 'input[name=\"nocache\"]').prop 'checked', @model.get 'nocache'\n (@$ '.modal-header .close').remove()\n (@$el.children \":first\").modal()\n\n @model.backup()\n\n @model.bind 'change', @render\n\n @render()\n @validate()\n no\n\n render: () =>\n @undelegateEvents()\n (@$ f).attr 'disabled', on for f in 'mimetype uri file_upload'.split ' '\n (@$ '#modalLabel').text \"Edit Asset\"\n (@$ '.asset-location').hide(); (@$ '.uri').hide(); (@$ '.skip_asset_check_checkbox').hide()\n (@$ '.asset-location.edit').show()\n (@$ '.mime-select').prop('disabled', 'true')\n\n if (@model.get 'mimetype') == 'video'\n (@$f 'duration').prop 'disabled', on\n\n for field in @model.fields\n if (@$fv field) != @model.get field\n @$fv field, @model.get field\n (@$ '.uri-text').html insertWbr truncate_str (@model.get 'uri')\n\n for which in ['start', 'end']\n d = date_to @model.get \"#{which}_date\"\n @$fv \"#{which}_date_date\", d.date()\n (@$f \"#{which}_date_date\").datepicker autoclose: yes, format: dateSettings.datepickerFormat\n (@$f \"#{which}_date_date\").datepicker 'setValue', d.date()\n @$fv \"#{which}_date_time\", d.time()\n\n @displayAdvanced()\n @delegateEvents()\n no\n\n viewmodel: =>\n for which in ['start', 'end']\n @$fv \"#{which}_date\", (moment (@$fv \"#{which}_date_date\") + \" \" + (@$fv \"#{which}_date_time\"), dateSettings.fullDate).toDate().toISOString()\n for field in @model.fields when not (@$f field).prop 'disabled'\n @model.set field, (@$fv field), silent:yes\n\n events:\n 'click #save-asset': 'save'\n 'click .cancel': 'cancel'\n 'change': 'change'\n 'keyup': 'change'\n 'click .advanced-toggle': 'toggleAdvanced'\n\n changeLoopTimes: =>\n current_date = new Date()\n end_date = new Date()\n\n switch @$('#loop_times').val()\n when \"day\"\n @setLoopDateTime (date_to current_date), (date_to end_date.setDate(current_date.getDate() + 1))\n when \"week\"\n @setLoopDateTime (date_to current_date), (date_to end_date.setDate(current_date.getDate() + 7))\n when \"month\"\n @setLoopDateTime (date_to current_date), (date_to end_date.setMonth(current_date.getMonth() + 1))\n when \"year\"\n @setLoopDateTime (date_to current_date), (date_to end_date.setFullYear(current_date.getFullYear() + 1))\n when \"forever\"\n @setLoopDateTime (date_to current_date), (date_to end_date.setFullYear(9999))\n when \"manual\"\n @setDisabledDatepicker(false)\n (@$ \"#manul_date\").show()\n return\n else\n return\n @setDisabledDatepicker(true)\n (@$ \"#manul_date\").hide()\n\n save: (e) =>\n @viewmodel()\n save = null\n @model.set 'nocache', if (@$ 'input[name=\"nocache\"]').prop 'checked' then 1 else 0\n\n if not @model.get 'name'\n if @model.old_name()\n @model.set {name: @model.old_name()}, silent:yes\n else if getMimetype @model.get 'uri'\n @model.set {name: get_filename @model.get 'uri'}, silent:yes\n else\n @model.set {name: @model.get 'uri'}, silent:yes\n save = @model.save()\n\n (@$ 'input, select').prop 'disabled', on\n save.done (data) =>\n @model.id = data.asset_id\n @collection.add @model if not @model.collection\n (@$el.children \":first\").modal 'hide'\n _.extend @model.attributes, data\n save.fail =>\n (@$ '.progress').hide()\n (@$ 'input, select').prop 'disabled', off\n no\n\n change: (e) =>\n @_change ||= _.throttle (=>\n @changeLoopTimes()\n @viewmodel()\n @model.trigger 'change'\n @validate(e)\n yes), 500\n @_change arguments...\n\n validate: (e) =>\n that = this\n validators =\n duration: (v) =>\n if ('video' isnt @model.get 'mimetype') and (not (_.isNumber v*1 ) or v*1 < 1)\n 'Please enter a valid number.'\n end_date: (v) =>\n unless (new Date @$fv 'start_date') < (new Date @$fv 'end_date')\n if $(e?.target)?.attr(\"name\") == \"start_date_date\"\n start_date = new Date @$fv 'start_date'\n end_date = new Date(start_date.getTime() + Math.max(parseInt(@$fv 'duration'), 60) * 1000)\n @setLoopDateTime (date_to start_date), (date_to end_date)\n return\n\n 'End date should be after start date.'\n errors = ([field, v] for field, fn of validators when v = fn (@$fv field))\n\n (@$ \".form-group .help-inline.invalid-feedback\").remove()\n (@$ \".form-group .form-control\").removeClass 'is-invalid'\n (@$ '[type=submit]').prop 'disabled', no\n for [field, v] in errors\n (@$ '[type=submit]').prop 'disabled', yes\n (@$ \".form-group.#{field} .form-control\").addClass 'is-invalid'\n (@$ \".form-group.#{field} .controls\").append \\\n $ (\"#{v}\")\n\n\n cancel: (e) =>\n @model.rollback()\n (@$el.children \":first\").modal 'hide'\n\n toggleAdvanced: =>\n (@$ '.fa-play').toggleClass 'rotated'\n (@$ '.fa-play').toggleClass 'unrotated'\n (@$ '.collapse-advanced').collapse 'toggle'\n\n displayAdvanced: =>\n img = 'image' is @$fv 'mimetype'\n edit = url_test @model.get 'uri'\n has_nocache = img and edit\n (@$ '.advanced-accordion').toggle has_nocache is on\n\n setLoopDateTime: (start_date, end_date) =>\n @$fv \"start_date_date\", start_date.date()\n (@$f \"start_date_date\").datepicker autoclose: yes, format: dateSettings.datepickerFormat\n (@$f \"start_date_date\").datepicker 'setDate', moment(start_date.date(), dateSettings.date).toDate()\n @$fv \"start_date_time\", start_date.time()\n @$fv \"end_date_date\", end_date.date()\n (@$f \"end_date_date\").datepicker autoclose: yes, format: dateSettings.datepickerFormat\n (@$f \"end_date_date\").datepicker 'setDate', moment(end_date.date(), dateSettings.date).toDate()\n @$fv \"end_date_time\", end_date.time()\n\n (@$ \".form-group .help-inline.invalid-feedback\").remove()\n (@$ \".form-group .form-control\").removeClass 'is-invalid'\n (@$ '[type=submit]').prop 'disabled', no\n\n setDisabledDatepicker: (b) =>\n for which in ['start', 'end']\n (@$f \"#{which}_date_date\").attr 'disabled', b\n (@$f \"#{which}_date_time\").attr 'disabled', b\n\nAPI.View.AssetRowView = class AssetRowView extends Backbone.View\n tagName: \"tr\"\n\n initialize: (options) =>\n @template = get_template 'asset-row'\n\n render: =>\n @$el.html @template _.extend json = @model.toJSON(),\n name: insertWbr truncate_str json.name # word break urls at slashes\n duration: durationSecondsToHumanReadable(json.duration)\n start_date: (date_to json.start_date).string()\n end_date: (date_to json.end_date).string()\n @$el.prop 'id', @model.get 'asset_id'\n (@$ \".delete-asset-button\").popover content: get_template 'confirm-delete'\n (@$ \".toggle input\").prop \"checked\", @model.get 'is_enabled'\n (@$ \".asset-icon\").addClass switch @model.get \"mimetype\"\n when \"video\" then \"fas fa-video\"\n when \"streaming\" then \"fas fa-video\"\n when \"image\" then \"far fa-image\"\n when \"webpage\" then \"fas fa-globe-americas\"\n else \"\"\n\n if (@model.get \"is_processing\") == 1\n (@$ 'input, button').prop 'disabled', on\n (@$ \".asset-toggle\").html get_template 'processing-message'\n\n @el\n\n events:\n 'change .is_enabled-toggle input': 'toggleIsEnabled'\n 'click .download-asset-button': 'download'\n 'click .edit-asset-button': 'edit'\n 'click .delete-asset-button': 'showPopover'\n\n toggleIsEnabled: (e) =>\n val = (1 + @model.get 'is_enabled') % 2\n @model.set is_enabled: val\n @setEnabled off\n save = @model.save()\n save.done => @setEnabled on\n save.fail =>\n @model.set @model.previousAttributes(), silent:yes # revert changes\n @setEnabled on\n @render()\n yes\n\n setEnabled: (enabled) => if enabled\n @$el.removeClass 'warning'\n @delegateEvents()\n (@$ 'input, button').prop 'disabled', off\n else\n @hidePopover()\n @undelegateEvents()\n @$el.addClass 'warning'\n (@$ 'input, button').prop 'disabled', on\n\n download: (e) =>\n r = $.get '/api/v1/assets/' + @model.id + '/content'\n .success (result) ->\n switch result['type']\n when 'url'\n window.open(result['url'])\n when 'file'\n content = base64js.toByteArray(result['content'])\n\n mimetype = result['mimetype']\n fn = result['filename']\n\n blob = new Blob([content], {type: mimetype})\n url = URL.createObjectURL(blob)\n\n a = document.createElement('a')\n document.body.appendChild(a)\n a.download = fn\n a.href = url\n a.click()\n\n URL.revokeObjectURL(url)\n a.remove()\n no\n\n edit: (e) =>\n new EditAssetView model: @model\n no\n\n delete: (e) =>\n @hidePopover()\n if (xhr = @model.destroy()) is not false\n xhr.done => @remove()\n else\n @remove()\n no\n\n showPopover: =>\n if not ($ '.popover').length\n (@$ \".delete-asset-button\").popover 'show'\n ($ '.confirm-delete').click @delete\n ($ window).one 'click', @hidePopover\n no\n\n hidePopover: =>\n (@$ \".delete-asset-button\").popover 'hide'\n no\n\n\nAPI.View.AssetsView = class AssetsView extends Backbone.View\n initialize: (options) =>\n @collection.bind event, @render for event in ('reset add remove sync'.split ' ')\n @sorted = (@$ '#active-assets').sortable\n containment: 'parent'\n axis: 'y'\n helper: 'clone'\n update: @update_order\n\n update_order: =>\n active = (@$ '#active-assets').sortable 'toArray'\n\n @collection.get(id).set('play_order', i) for id, i in active\n @collection.get(el.id).set('play_order', active.length) for el in (@$ '#inactive-assets tr').toArray()\n\n $.post '/api/v1/assets/order', ids: ((@$ '#active-assets').sortable 'toArray').join ','\n\n render: =>\n @collection.sort()\n\n (@$ \"##{which}-assets\").html '' for which in ['active', 'inactive']\n\n @collection.each (model) =>\n which = if model.active() then 'active' else 'inactive'\n (@$ \"##{which}-assets\").append (new AssetRowView model: model).render()\n\n for which in ['active', 'inactive']\n if (@$ \"##{which}-assets tr\").length == 0\n (@$ \"##{which}-assets-section .table-assets-help-text\").show()\n else\n (@$ \"##{which}-assets-section .table-assets-help-text\").hide()\n\n for which in ['inactive', 'active']\n @$(\".#{which}-table thead\").toggle !!(@$(\"##{which}-assets tr\").length)\n\n @update_order()\n\n @el\n\n\nAPI.App = class App extends Backbone.View\n initialize: =>\n ($ window).ajaxError (e,r) ->\n ($ '#request-error').html (get_template 'request-error')()\n if (j = $.parseJSON r.responseText) and (err = j.error)\n ($ '#request-error .msg').text 'Server Error: ' + err\n ($ '#request-error').show()\n setTimeout ->\n ($ '#request-error').fadeOut('slow')\n , 5000\n ($ window).ajaxSuccess (event, request, settings) ->\n if (settings.url == new Assets().url) and (settings.type == 'POST')\n ($ '#request-error').html (get_template 'request-success')()\n ($ '#request-error .msg').text 'Asset has been successfully uploaded.'\n ($ '#request-error').show()\n setTimeout ->\n ($ '#request-error').fadeOut('slow')\n , 5000\n\n (API.assets = new Assets()).fetch()\n API.assetsView = new AssetsView\n collection: API.assets\n el: @$ '#assets'\n\n for address in wsAddresses\n try\n ws = new WebSocket address\n ws.onmessage = (x) ->\n model = API.assets.get(x.data)\n if model\n save = model.fetch()\n catch error\n no\n\n events:\n 'click .add-asset-button': 'add',\n 'click #previous-asset-button': 'previous',\n 'click #next-asset-button': 'next'\n\n add: (e) ->\n new AddAssetView\n no\n\n previous: (e) ->\n $.get '/api/v1/assets/control/previous'\n\n next: (e) ->\n $.get '/api/v1/assets/control/next'\n" - ] + "mappings": "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" } \ No newline at end of file diff --git a/viewer.py b/viewer.py index 3309528c6..96710fd09 100755 --- a/viewer.py +++ b/viewer.py @@ -432,7 +432,7 @@ def setup(): def setup_hotspot(): - bus = pydbus.SystemBus() + bus = pydbus.SessionBus() pattern_include = re.compile("wlan*") pattern_exclude = re.compile("ScreenlyOSE-*") From e3e69117ff6471febe3fa51ecbe7ed1353c51013 Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Thu, 5 Nov 2020 13:57:12 +0600 Subject: [PATCH 028/224] Edits: docker-compose in the ansible task --- .../screenly/files/screenly-celery.service | 13 --- .../roles/screenly/files/screenly-web.service | 15 --- .../screenly-websocket_server_layer.service | 11 --- ansible/roles/screenly/tasks/main.yml | 92 +++++++++++++++---- ansible/roles/screenly/vars/main.yml | 6 +- ansible/roles/ssl/tasks/main.yml | 13 --- ansible/roles/system/tasks/main.yml | 2 +- docker-compose.demo.yml | 2 + docker/Dockerfile.celery.dev | 7 +- docker/Dockerfile.server | 43 +++++++++ docker/Dockerfile.websocket | 29 ++++++ lib/utils.py | 4 + requirements/requirements.host.txt | 2 + server.py | 3 +- templates/settings.html | 2 +- 15 files changed, 164 insertions(+), 80 deletions(-) delete mode 100644 ansible/roles/screenly/files/screenly-celery.service delete mode 100644 ansible/roles/screenly/files/screenly-web.service delete mode 100644 ansible/roles/screenly/files/screenly-websocket_server_layer.service create mode 100644 docker/Dockerfile.server create mode 100644 docker/Dockerfile.websocket create mode 100644 requirements/requirements.host.txt diff --git a/ansible/roles/screenly/files/screenly-celery.service b/ansible/roles/screenly/files/screenly-celery.service deleted file mode 100644 index 82b5ebe63..000000000 --- a/ansible/roles/screenly/files/screenly-celery.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Screenly celery worker -After=redis-server.service - -[Service] -WorkingDirectory=/home/pi/screenly -User=pi -ExecStart=/usr/local/bin/celery worker -A server.celery -B -n worker@screenly --loglevel=info --schedule /home/pi/.screenly/celerybeat-schedule -Restart=always -RestartSec=5 - -[Install] -WantedBy=multi-user.target diff --git a/ansible/roles/screenly/files/screenly-web.service b/ansible/roles/screenly/files/screenly-web.service deleted file mode 100644 index 15051195c..000000000 --- a/ansible/roles/screenly/files/screenly-web.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Screenly Web UI -After=network-online.target - -[Service] -WorkingDirectory=/home/pi/screenly -User=pi -ExecStartPre=/usr/bin/python /home/pi/screenly/bin/wait.py -ExecStart=/usr/bin/python /home/pi/screenly/server.py -Restart=always -RestartSec=5 -Environment=PYTHONPATH=/home/pi/screenly - -[Install] -WantedBy=multi-user.target diff --git a/ansible/roles/screenly/files/screenly-websocket_server_layer.service b/ansible/roles/screenly/files/screenly-websocket_server_layer.service deleted file mode 100644 index e196768c0..000000000 --- a/ansible/roles/screenly/files/screenly-websocket_server_layer.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Websocket Server layer - -[Service] -WorkingDirectory=/home/pi/screenly -User=pi -ExecStart=/usr/bin/python /home/pi/screenly/websocket_server_layer.py -Restart=always - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index ad60aa60d..77d8dc575 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -33,7 +33,7 @@ - name: Install pip dependencies pip: - requirements: /home/pi/screenly/requirements/requirements.txt + requirements: /home/pi/screenly/requirements/requirements.host.txt extra_args: "--no-cache-dir --upgrade" - name: Create default assets database if does not exists @@ -138,7 +138,6 @@ state: stopped enabled: no with_items: "{{ deprecated_screenly_systemd_units }}" - when: x_service_exist - name: Remove deprecated systemd units file: @@ -156,23 +155,78 @@ - debug: msg: "Use {{ docker_tag }} version of images." -- name: Create screenly-viewer container - docker_container: - name: screenly-ose-viewer - image: "ruskodevelop/screenly-ose-viewer:latest" - pull: true - state: started - recreate: true - restart_policy: unless-stopped - network_mode: host - privileged: yes - log_driver: journald - volumes: - - /home/pi/screenly:/home/pi/screenly - - /home/pi/.screenly:/home/pi/.screenly - - /home/pi/screenly_assets:/home/pi/screenly_assets - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro +- name: Run docker-compose + docker_compose: + project_name: screenly + definition: + version: "2" + services: + screenly-server: + image: ruskodevelop/screenly-ose-server:latest + container_name: screenly-server + entrypoint: python server.py + restart: unless-stopped + network_mode: "host" + volumes: + - /home/pi/screenly_assets:/home/pi/screenly_assets + - /home/pi/screenly:/home/pi/screenly + - /home/pi/.screenly:/home/pi/.screenly + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + + screenly-viewer: + image: ruskodevelop/screenly-ose-viewer:latest + container_name: screenly-viewer + privileged: true + restart: unless-stopped + network_mode: "host" + volumes: + - /home/pi/screenly_assets:/home/pi/screenly_assets + - /home/pi/screenly:/home/pi/screenly + - /home/pi/.screenly:/home/pi/.screenly + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + depends_on: + - screenly-server + + screenly-websocket: + image: ruskodevelop/screenly-ose-websocket:latest + container_name: screenly-websocket + restart: unless-stopped + network_mode: "host" + volumes: + - /home/pi/screenly_assets:/home/pi/screenly_assets + - /home/pi/screenly:/home/pi/screenly + - /home/pi/.screenly:/home/pi/.screenly + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + depends_on: + - screenly-server + + screenly-celery: + image: ruskodevelop/screenly-ose-server:latest + container_name: screenly-celery + entrypoint: celery worker -A server.celery -B -n worker@screenly --loglevel=info --schedule /tmp/celerybeat-schedule + network_mode: "host" + restart: unless-stopped + volumes: + - /home/pi/screenly_assets:/home/pi/screenly_assets + - /home/pi/screenly:/home/pi/screenly + - /home/pi/.screenly:/home/pi/.screenly + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + depends_on: + - screenly-server + - redis + + redis: + image: redis:alpine + restart: unless-stopped + ports: + - "6379:6379" + + pull: yes + recreate: smart - name: Pause screenly-viewer container command: docker pause screenly-ose-viewer diff --git a/ansible/roles/screenly/vars/main.yml b/ansible/roles/screenly/vars/main.yml index 3c335064e..fd9e1958f 100644 --- a/ansible/roles/screenly/vars/main.yml +++ b/ansible/roles/screenly/vars/main.yml @@ -1,10 +1,10 @@ screenly_systemd_units: - - screenly-celery.service - - screenly-web.service - - screenly-websocket_server_layer.service - udev-restart.service deprecated_screenly_systemd_units: + - screenly-celery.service + - screenly-web.service + - screenly-websocket_server_layer.service - screenly-viewer.service - X.service - matchbox.service diff --git a/ansible/roles/ssl/tasks/main.yml b/ansible/roles/ssl/tasks/main.yml index 763355af6..48126ce66 100644 --- a/ansible/roles/ssl/tasks/main.yml +++ b/ansible/roles/ssl/tasks/main.yml @@ -68,16 +68,3 @@ tags: - enable-ssl when: not no_use_ssl_parameter - -- name: Modifies screenly-web service to only listen on localhost - lineinfile: - regexp: '^.*LISTEN.*' - state: absent - dest: /etc/systemd/system/screenly-web.service - notify: - - reload systemctl - - restart-screenly-websocket_server_layer - - restart-screenly-server - - restart-screenly-celery - tags: - - enable-ssl diff --git a/ansible/roles/system/tasks/main.yml b/ansible/roles/system/tasks/main.yml index 1a06efb8e..927043859 100644 --- a/ansible/roles/system/tasks/main.yml +++ b/ansible/roles/system/tasks/main.yml @@ -177,7 +177,6 @@ - python-gobject - python-netifaces - python-simplejson - - redis-server - rpi-update - sqlite3 - systemd @@ -192,6 +191,7 @@ - matchbox - pix-plym-splash - rabbitmq-server + - redis-server - supervisor - uzbl - x11-xserver-utils diff --git a/docker-compose.demo.yml b/docker-compose.demo.yml index 7b843e2e8..b66da1968 100644 --- a/docker-compose.demo.yml +++ b/docker-compose.demo.yml @@ -14,6 +14,7 @@ services: - ./:/home/pi/screenly:ro - screenly-assets-volume:/home/pi/screenly_assets - screenly-volume:/home/pi/.screenly + screenly-celery: image: screenly/ose-dev-celery:latest restart: always @@ -27,6 +28,7 @@ services: - ./:/home/pi/screenly:ro - screenly-assets-volume:/home/pi/screenly_assets - screenly-volume:/home/pi/.screenly + redis: image: redis:alpine logging: diff --git a/docker/Dockerfile.celery.dev b/docker/Dockerfile.celery.dev index a64733314..b195f332c 100644 --- a/docker/Dockerfile.celery.dev +++ b/docker/Dockerfile.celery.dev @@ -8,13 +8,14 @@ RUN apt-get update && \ git \ libffi-dev \ libssl-dev \ + lsb-release \ mplayer \ net-tools \ procps \ + python-pip \ + python-setuptools \ python-dev \ python-gobject \ - python-setuptools \ - python-pip \ python-pil \ python-simplejson \ sqlite3 \ @@ -23,7 +24,7 @@ RUN apt-get update && \ # Install Python requirements ADD requirements/requirements.txt /tmp/requirements.txt -RUN pip install -r /tmp/requirements.txt +RUN pip install --no-cache-dir -r /tmp/requirements.txt RUN useradd pi diff --git a/docker/Dockerfile.server b/docker/Dockerfile.server new file mode 100644 index 000000000..459f10e0d --- /dev/null +++ b/docker/Dockerfile.server @@ -0,0 +1,43 @@ +FROM resin/rpi-raspbian:buster + +RUN apt-get update && \ + apt-get -y install --no-install-recommends \ + build-essential \ + curl \ + ffmpeg \ + git \ + libffi-dev \ + libssl-dev \ + lsb-release \ + mplayer \ + net-tools \ + procps \ + python-pip \ + python-setuptools \ + python-dev \ + python-gobject \ + python-pil \ + python-simplejson \ + sqlite3 \ + && \ + apt-get clean + +# Install Python requirements +ADD requirements/requirements.txt /tmp/requirements.txt +RUN pip install --no-cache-dir -r /tmp/requirements.txt + +# Create runtime user +RUN useradd pi + +# Install config file and file structure +RUN mkdir -p /home/pi/.screenly /home/pi/screenly /home/pi/screenly_assets +COPY ansible/roles/screenly/files/default_assets.yml /home/pi/.screenly/default_assets.yml +COPY ansible/roles/screenly/files/screenly.conf /home/pi/.screenly/screenly.conf +RUN chown -R pi:pi /home/pi/.screenly /home/pi/screenly_assets + +USER pi +WORKDIR /home/pi/screenly + +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 diff --git a/docker/Dockerfile.websocket b/docker/Dockerfile.websocket new file mode 100644 index 000000000..cd4014b11 --- /dev/null +++ b/docker/Dockerfile.websocket @@ -0,0 +1,29 @@ +FROM resin/rpi-raspbian:buster + +RUN apt-get update && \ + apt-get -y install --no-install-recommends \ + build-essential \ + curl \ + libffi-dev \ + python-setuptools \ + python-pip \ + python-dev && \ + apt-get clean + +RUN pip install --upgrade pip + +# Install Python requirements +ADD requirements/requirements-websocket.txt /tmp/requirements.txt +RUN pip install --no-cache-dir -r /tmp/requirements.txt + +# Create runtime user +RUN useradd pi + +# Install config file and file structure +RUN mkdir -p /home/pi/.screenly /home/pi/screenly /home/pi/screenly_assets +RUN chown -R pi:pi /home/pi/.screenly /home/pi/screenly_assets + +USER pi +WORKDIR /home/pi/screenly + +CMD python websocket_server_layer.py diff --git a/lib/utils.py b/lib/utils.py index d6adb7a03..bcbc0c19b 100644 --- a/lib/utils.py +++ b/lib/utils.py @@ -331,6 +331,10 @@ def generate_perfect_paper_password(pw_length=10, has_symbols=True): return "".join(random.SystemRandom().choice(ppp_letters) for _ in range(pw_length)) +def is_docker(): + return os.path.isfile('/.dockerenv') + + def is_balena_app(): """ Checks the application is running on Balena Cloud diff --git a/requirements/requirements.host.txt b/requirements/requirements.host.txt new file mode 100644 index 000000000..a3d2b8919 --- /dev/null +++ b/requirements/requirements.host.txt @@ -0,0 +1,2 @@ +docker==4.3.1 +docker-compose==1.26.2 diff --git a/server.py b/server.py index b1e9ebd09..617c57698 100755 --- a/server.py +++ b/server.py @@ -42,7 +42,7 @@ from lib import queries from lib.auth import authorized -from lib.utils import generate_perfect_paper_password +from lib.utils import generate_perfect_paper_password, is_docker from lib.utils import get_active_connections, remove_connection from lib.utils import get_node_ip, get_node_mac_address from lib.utils import get_video_duration @@ -1740,6 +1740,7 @@ def settings_page(): 'user': settings['user'], 'need_current_password': bool(settings['auth_backend']), 'is_balena': is_balena_app(), + 'is_docker': is_docker(), 'auth_backend': settings['auth_backend'], 'auth_backends': auth_backends }) diff --git a/templates/settings.html b/templates/settings.html index ef382febf..0bb36c579 100644 --- a/templates/settings.html +++ b/templates/settings.html @@ -227,7 +227,7 @@

- {% if not context.is_balena %} + {% if not (context.is_balena or context.is_docker) %} {# USB assets #}
From 4548587deb438e46cea808677a83be527f1f5924 Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Thu, 5 Nov 2020 16:08:21 +0600 Subject: [PATCH 029/224] Fix: ansible tasks --- ansible/roles/screenly/tasks/main.yml | 3 ++- static/js/settings.js | 2 +- static/js/settings.js.map | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 static/js/settings.js.map diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index 77d8dc575..ea73c6172 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -138,6 +138,7 @@ state: stopped enabled: no with_items: "{{ deprecated_screenly_systemd_units }}" + when: x_service_exist - name: Remove deprecated systemd units file: @@ -229,4 +230,4 @@ recreate: smart - name: Pause screenly-viewer container - command: docker pause screenly-ose-viewer + command: docker pause screenly-viewer diff --git a/static/js/settings.js b/static/js/settings.js index b577b5d6d..a96446c27 100644 --- a/static/js/settings.js +++ b/static/js/settings.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.9.3 +// Generated by CoffeeScript 1.12.7 (function() { $().ready(function() { var end_date, end_date_usb_file, start_date, start_date_usb_file, toggle_chunk; diff --git a/static/js/settings.js.map b/static/js/settings.js.map new file mode 100644 index 000000000..dbe556573 --- /dev/null +++ b/static/js/settings.js.map @@ -0,0 +1,10 @@ +{ + "version": 3, + "file": "settings.js", + "sourceRoot": "", + "sources": [ + "settings.coffee" + ], + "names": [], + "mappings": "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" +} \ No newline at end of file From ebba512d299e2789c5e70750c01f1ea551f657a4 Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Thu, 5 Nov 2020 16:18:44 +0600 Subject: [PATCH 030/224] Fix: images pull location --- ansible/roles/screenly/tasks/main.yml | 8 ++--- docker/Dockerfile.travis | 48 --------------------------- 2 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 docker/Dockerfile.travis diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index ea73c6172..658561fb7 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -163,7 +163,7 @@ version: "2" services: screenly-server: - image: ruskodevelop/screenly-ose-server:latest + image: "screenly/screenly-ose-server:{{ docker_tag }}" container_name: screenly-server entrypoint: python server.py restart: unless-stopped @@ -176,7 +176,7 @@ - /etc/localtime:/etc/localtime:ro screenly-viewer: - image: ruskodevelop/screenly-ose-viewer:latest + image: "screenly/screenly-ose-viewer:{{ docker_tag }}-{{ device_type }}" container_name: screenly-viewer privileged: true restart: unless-stopped @@ -191,7 +191,7 @@ - screenly-server screenly-websocket: - image: ruskodevelop/screenly-ose-websocket:latest + image: "screenly/screenly-ose-websocket:{{ docker_tag }}" container_name: screenly-websocket restart: unless-stopped network_mode: "host" @@ -205,7 +205,7 @@ - screenly-server screenly-celery: - image: ruskodevelop/screenly-ose-server:latest + image: "screenly/screenly-ose-celery:{{ docker_tag }}" container_name: screenly-celery entrypoint: celery worker -A server.celery -B -n worker@screenly --loglevel=info --schedule /tmp/celerybeat-schedule network_mode: "host" diff --git a/docker/Dockerfile.travis b/docker/Dockerfile.travis deleted file mode 100644 index 57a290d55..000000000 --- a/docker/Dockerfile.travis +++ /dev/null @@ -1,48 +0,0 @@ -FROM ubuntu:16.04 -MAINTAINER Anton Molodykh - -RUN apt-get update && \ - apt-get -y install \ - build-essential \ - curl \ - ffmpeg \ - git-core \ - libdbus-glib-1-dev \ - libgtk2.0-0 \ - mplayer \ - net-tools \ - psmisc \ - python-dev \ - python-pip \ - software-properties-common \ - sqlite3 \ - xvfb && \ - apt-get clean - -RUN curl https://ftp.mozilla.org/pub/firefox/releases/45.0/linux-x86_64/en-US/firefox-45.0.tar.bz2 > /tmp/firefox.tar.bz2 -RUN tar -xjf /tmp/firefox.tar.bz2 -C /tmp -RUN ln -s /tmp/firefox/firefox /usr/bin/firefox - -ENV DISPLAY=:99 - -RUN pip install --upgrade pip -ADD requirements.txt /tmp/requirements.txt -ADD requirements.viewer.txt /tmp/requirements.viewer.txt -ADD requirements.server.txt /tmp/requirements.server.txt -ADD requirements.dev.txt /tmp/requirements.dev.txt - -RUN pip install ansible==2.5.3 \ - -r /tmp/requirements.txt \ - -r /tmp/requirements.viewer.txt \ - -r /tmp/requirements.server.txt \ - -r /tmp/requirements.dev.txt - -RUN mkdir -p ~/.screenly ~/screenly_assets -ADD ansible/roles/screenly/files/screenly.conf /root/.screenly/ -ADD ansible/roles/screenly/files/screenly.db /root/.screenly/ -ADD ansible/roles/screenly/files/screenly_utils.sh /tmp/screenly_utils.sh -RUN curl https://www.screenly.io/upload/ose-logo.png > /tmp/image.png -RUN curl https://www.screenly.io/upload/ose-logo.png > ~/screenly_assets/image.tmp -RUN curl https://www.screenly.io/upload/big_buck_bunny_720p_10mb.flv > /tmp/video.flv - -WORKDIR /root/screenly From 8d3aa71dced59e4f67f0651b55ee0479c12af310 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 5 Nov 2020 11:51:24 +0000 Subject: [PATCH 031/224] Fixes group --- ansible/roles/system/tasks/main.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ansible/roles/system/tasks/main.yml b/ansible/roles/system/tasks/main.yml index 927043859..d40eb06db 100644 --- a/ansible/roles/system/tasks/main.yml +++ b/ansible/roles/system/tasks/main.yml @@ -234,7 +234,18 @@ - name: Add pi to docker group user: name: pi - group: docker + group: pi + groups: + - docker + - adm + - sudo + - video + - plugdev + - users + - input + - netdev + - gpio + - dialout - name: Perform system upgrade apt: From a9a499b0a7a7cb61ca8b87f83926c3a41d57509c Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Thu, 5 Nov 2020 17:57:42 +0600 Subject: [PATCH 032/224] Edits: build images locally --- ansible/roles/screenly/tasks/main.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index 658561fb7..589ce7a43 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -164,6 +164,9 @@ services: screenly-server: image: "screenly/screenly-ose-server:{{ docker_tag }}" + build: + context: /home/pi/screenly + dockerfile: /home/pi/screenly/docker/Dockerfile.server container_name: screenly-server entrypoint: python server.py restart: unless-stopped @@ -177,6 +180,11 @@ screenly-viewer: image: "screenly/screenly-ose-viewer:{{ docker_tag }}-{{ device_type }}" + build: + context: /home/pi/screenly + dockerfile: /home/pi/screenly/docker/Dockerfile.viewer + args: + - PI_VERSION={{ device_type }} container_name: screenly-viewer privileged: true restart: unless-stopped @@ -192,6 +200,9 @@ screenly-websocket: image: "screenly/screenly-ose-websocket:{{ docker_tag }}" + build: + context: /home/pi/screenly + dockerfile: /home/pi/screenly/docker/Dockerfile.websocket container_name: screenly-websocket restart: unless-stopped network_mode: "host" @@ -206,6 +217,9 @@ screenly-celery: image: "screenly/screenly-ose-celery:{{ docker_tag }}" + build: + context: /home/pi/screenly + dockerfile: /home/pi/screenly/docker/Dockerfile.server container_name: screenly-celery entrypoint: celery worker -A server.celery -B -n worker@screenly --loglevel=info --schedule /tmp/celerybeat-schedule network_mode: "host" @@ -226,7 +240,7 @@ ports: - "6379:6379" - pull: yes + pull: no recreate: smart - name: Pause screenly-viewer container From 654ff9d469c629eba2b16e9a7cc46c264927ab9d Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Thu, 5 Nov 2020 19:44:03 +0600 Subject: [PATCH 033/224] Edits after review --- ansible/roles/screenly/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index 589ce7a43..ae43d61e8 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -240,7 +240,6 @@ ports: - "6379:6379" - pull: no recreate: smart - name: Pause screenly-viewer container From 66379bfea3e65cfb37a919cd7df640d1816af2da Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 5 Nov 2020 17:49:23 +0000 Subject: [PATCH 034/224] Ansible/Docker fixes --- ansible/roles/screenly/tasks/main.yml | 48 ++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index ae43d61e8..27699df64 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -44,6 +44,7 @@ dest: /home/pi/.screenly/screenly.db force: no +# This needs to be moved into Docker - name: Run database migration become_user: pi command: python /home/pi/screenly/bin/migrate.py @@ -156,13 +157,44 @@ - debug: msg: "Use {{ docker_tag }} version of images." +- name: Build screenly-ose-server + docker_image: + name: "screenly/screenly-ose-server:{{ docker_tag }}" + build: + path: /home/pi/screenly + dockerfile: /home/pi/screenly/docker/Dockerfile.server + source: build + +- name: Build screenly-ose-viewer + docker_image: + name: "screenly/screenly-ose-viewer:{{ docker_tag }}-{{ device_type }}" + build: + path: /home/pi/screenly + dockerfile: /home/pi/screenly/docker/Dockerfile.viewer + args: + - PI_VERSION={{ device_type }} + +- name: Build screenly-ose-websocket + docker_image: + name: "screenly/screenly-ose-websocket:{{ docker_tag }}" + build: + path: /home/pi/screenly + dockerfile: /home/pi/screenly/docker/Dockerfile.websocket + +- name: Build screenly-ose-celery + docker_image: + name: "screenly/screenly-ose-celery:{{ docker_tag }}" + build: + path: /home/pi/screenly + dockerfile: /home/pi/screenly/docker/Dockerfile.server + - name: Run docker-compose docker_compose: project_name: screenly definition: version: "2" services: - screenly-server: + screenly-ose-server: image: "screenly/screenly-ose-server:{{ docker_tag }}" build: context: /home/pi/screenly @@ -178,7 +210,7 @@ - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro - screenly-viewer: + screenly-ose-viewer: image: "screenly/screenly-ose-viewer:{{ docker_tag }}-{{ device_type }}" build: context: /home/pi/screenly @@ -196,14 +228,14 @@ - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro depends_on: - - screenly-server + - screenly-ose-server - screenly-websocket: + screenly-ose-websocket: image: "screenly/screenly-ose-websocket:{{ docker_tag }}" build: context: /home/pi/screenly dockerfile: /home/pi/screenly/docker/Dockerfile.websocket - container_name: screenly-websocket + container_name: screenly-ose-websocket restart: unless-stopped network_mode: "host" volumes: @@ -213,9 +245,9 @@ - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro depends_on: - - screenly-server + - screenly-ose-server - screenly-celery: + screenly-ose-celery: image: "screenly/screenly-ose-celery:{{ docker_tag }}" build: context: /home/pi/screenly @@ -231,7 +263,7 @@ - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro depends_on: - - screenly-server + - screenly-ose-server - redis redis: From e16ff5baff8285aed93440eb17cbc674600288ad Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 5 Nov 2020 17:55:21 +0000 Subject: [PATCH 035/224] Add explicit pull policy --- ansible/roles/screenly/tasks/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index 27699df64..7c995d783 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -161,6 +161,7 @@ docker_image: name: "screenly/screenly-ose-server:{{ docker_tag }}" build: + pull: no path: /home/pi/screenly dockerfile: /home/pi/screenly/docker/Dockerfile.server source: build @@ -169,6 +170,7 @@ docker_image: name: "screenly/screenly-ose-viewer:{{ docker_tag }}-{{ device_type }}" build: + pull: no path: /home/pi/screenly dockerfile: /home/pi/screenly/docker/Dockerfile.viewer args: @@ -178,6 +180,7 @@ docker_image: name: "screenly/screenly-ose-websocket:{{ docker_tag }}" build: + pull: no path: /home/pi/screenly dockerfile: /home/pi/screenly/docker/Dockerfile.websocket @@ -185,6 +188,7 @@ docker_image: name: "screenly/screenly-ose-celery:{{ docker_tag }}" build: + pull: no path: /home/pi/screenly dockerfile: /home/pi/screenly/docker/Dockerfile.server From a400699e220d2cff8570a4ba77a21aa2e0d3cb93 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 5 Nov 2020 18:07:46 +0000 Subject: [PATCH 036/224] Fixes docker reference --- docker/Dockerfile.server | 2 +- docker/Dockerfile.viewer | 2 +- docker/Dockerfile.websocket | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.server b/docker/Dockerfile.server index 459f10e0d..5640a54b6 100644 --- a/docker/Dockerfile.server +++ b/docker/Dockerfile.server @@ -1,4 +1,4 @@ -FROM resin/rpi-raspbian:buster +FROM balenalib/rpi-raspbian:buster RUN apt-get update && \ apt-get -y install --no-install-recommends \ diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index 8493a0323..d7fdc638e 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -1,4 +1,4 @@ -FROM resin/rpi-raspbian:stretch +FROM balenalib/rpi-raspbian:stretch RUN apt-get update && \ apt-get -y install \ diff --git a/docker/Dockerfile.websocket b/docker/Dockerfile.websocket index cd4014b11..1f3f9674d 100644 --- a/docker/Dockerfile.websocket +++ b/docker/Dockerfile.websocket @@ -1,4 +1,4 @@ -FROM resin/rpi-raspbian:buster +FROM balenalib/rpi-raspbian:buster RUN apt-get update && \ apt-get -y install --no-install-recommends \ From 9b546f23764a8b2cac74508eaf7cae0718b50521 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 6 Nov 2020 09:21:23 +0000 Subject: [PATCH 037/224] More expriments with docker-compose module --- ansible/roles/screenly/tasks/main.yml | 38 +++------------------------ 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index 7c995d783..c2988c7d2 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -157,44 +157,12 @@ - debug: msg: "Use {{ docker_tag }} version of images." -- name: Build screenly-ose-server - docker_image: - name: "screenly/screenly-ose-server:{{ docker_tag }}" - build: - pull: no - path: /home/pi/screenly - dockerfile: /home/pi/screenly/docker/Dockerfile.server - source: build - -- name: Build screenly-ose-viewer - docker_image: - name: "screenly/screenly-ose-viewer:{{ docker_tag }}-{{ device_type }}" - build: - pull: no - path: /home/pi/screenly - dockerfile: /home/pi/screenly/docker/Dockerfile.viewer - args: - - PI_VERSION={{ device_type }} - -- name: Build screenly-ose-websocket - docker_image: - name: "screenly/screenly-ose-websocket:{{ docker_tag }}" - build: - pull: no - path: /home/pi/screenly - dockerfile: /home/pi/screenly/docker/Dockerfile.websocket - -- name: Build screenly-ose-celery - docker_image: - name: "screenly/screenly-ose-celery:{{ docker_tag }}" - build: - pull: no - path: /home/pi/screenly - dockerfile: /home/pi/screenly/docker/Dockerfile.server - - name: Run docker-compose docker_compose: project_name: screenly + debug: yes + pull: no + build: yes definition: version: "2" services: From b9ab754513907dcbafef36955369461482a61cf2 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Sun, 8 Nov 2020 14:24:05 +0000 Subject: [PATCH 038/224] Renames containers in Belana. --- docker-compose.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 16e77dc88..d80281862 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,7 @@ +# This is the docker-compose file for Balena. version: "2" services: - screenly-server: + screenly-ose-server: build: context: . dockerfile: docker/Dockerfile.server.template @@ -18,18 +19,18 @@ services: volumes: - resin-data:/data - screenly-viewer: + screenly-ose-viewer: build: context: . dockerfile: docker/Dockerfile.viewer.template depends_on: - - screenly-server + - screenly-ose-server environment: - HOME=/data - NOREFRESH=1 - PYTHONPATH=/data/screenly - SCREENLYSERVICE=viewer - - LISTEN=screenly-server + - LISTEN=screenly-ose-server - PORT=80 - QT_QPA_PLATFORM=eglfs network_mode: "host" @@ -38,17 +39,17 @@ services: volumes: - resin-data:/data - screenly-websocket: + screenly-ose-websocket: build: context: . dockerfile: docker/Dockerfile.websocket.template depends_on: - - screenly-server + - screenly-ose-server environment: - HOME=/data - PYTHONPATH=/data/screenly - SCREENLYSERVICE=websocket - - LISTEN=screenly-server + - LISTEN=screenly-ose-server ports: - 9999:9999 privileged: true @@ -56,17 +57,16 @@ services: volumes: - resin-data:/data - screenly-celery: + screenly-ose-celery: build: context: . - dockerfile: docker/Dockerfile.celery.template + dockerfile: docker/Dockerfile.celery depends_on: - - screenly-server + - screenly-ose-server - redis environment: - HOME=/data - PYTHONPATH=/data/screenly - - SCREENLYSERVICE=celery - CELERY_BROKER_URL=redis://redis:6379/0 - CELERY_RESULT_BACKEND=redis://redis:6379/0 privileged: true From d019bbda342e1a460b2fb8398f82b1ff78acb045 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Sun, 8 Nov 2020 14:24:21 +0000 Subject: [PATCH 039/224] Include more ignore patterns. --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index e27ce00bb..b61fdde00 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,8 @@ node_modules *.retry .env + +.git/* +.github/ +docker/* +docks/* From e275aa4fc41cb7a8a6960d1bf9b21344c7c53a9f Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 14:53:21 +0000 Subject: [PATCH 040/224] First step towards consolidating Balena and non-Balena environments. --- bin/start_balena.sh | 99 ---------------------------- bin/start_server.sh | 27 ++++++++ bin/start_viewer.sh | 4 +- docker-compose.yml | 15 ++--- docker/Dockerfile.celery.template | 30 --------- docker/Dockerfile.redis.template | 8 --- docker/Dockerfile.server | 23 +++---- docker/Dockerfile.server.template | 37 ----------- docker/Dockerfile.viewer | 18 ++--- docker/Dockerfile.viewer.template | 63 ------------------ docker/Dockerfile.websocket | 21 +++--- docker/Dockerfile.websocket.template | 18 ----- docs/developer-documentation.md | 4 ++ 13 files changed, 60 insertions(+), 307 deletions(-) delete mode 100755 bin/start_balena.sh create mode 100755 bin/start_server.sh mode change 100644 => 100755 bin/start_viewer.sh delete mode 100644 docker/Dockerfile.celery.template delete mode 100644 docker/Dockerfile.redis.template delete mode 100644 docker/Dockerfile.server.template delete mode 100644 docker/Dockerfile.viewer.template delete mode 100644 docker/Dockerfile.websocket.template diff --git a/bin/start_balena.sh b/bin/start_balena.sh deleted file mode 100755 index d4d48c09c..000000000 --- a/bin/start_balena.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/bash - -run_setup () { - mkdir -p \ - /data/.config \ - /data/.screenly \ - /data/screenly \ - /data/screenly_assets - - cp -n /tmp/screenly/ansible/roles/screenly/files/screenly.conf /data/.screenly/screenly.conf - cp -n /tmp/screenly/ansible/roles/screenly/files/default_assets.yml /data/.screenly/default_assets.yml - cp -n /tmp/screenly/ansible/roles/screenly/files/screenly.db /data/.screenly/screenly.db - - cp -rf /tmp/screenly/* /data/screenly/ - - if [ -n "${OVERWRITE_CONFIG}" ]; then - echo "Requested to overwrite Screenly config file." - cp /data/screenly/ansible/roles/screenly/files/screenly.conf "/data/.screenly/screenly.conf" - fi - - # Set management page's user and password from environment variables, - # but only if both of them are provided. Can have empty values provided. - if [ -n "${MANAGEMENT_USER+x}" ] && [ -n "${MANAGEMENT_PASSWORD+x}" ]; then - sed -i -e "s/^user=.*/user=${MANAGEMENT_USER}/" -e "s/^password=.*/password=${MANAGEMENT_PASSWORD}/" /data/.screenly/screenly.conf - fi - - /usr/bin/python /data/screenly/bin/migrate.py -} - -run_viewer () { - # By default docker gives us 64MB of shared memory size but to display heavy - # pages we need more. - umount /dev/shm && mount -t tmpfs shm /dev/shm - - while true; do - - error=$(curl screenly-server:80 2>&1 | grep -c "Failed to connect") - if [[ "$error" -eq 0 ]]; then - break - fi - - echo "Still continue..." - sleep 1 - done - - trap '' 16 - - cd /data/screenly && QT_QPA_EGLFS_FORCE888=1 HOME=/data dbus-run-session python viewer.py & - - # Waiting for the viewer - while true; do - PID=$(pidof python) - if [ "$?" == '0' ]; then - break - fi - sleep 0.5 - done - - # Exit when the viewer falls - while kill -0 "$PID"; do - sleep 1 - done -} - -run_server () { - service nginx start - - export RESIN_UUID=${RESIN_DEVICE_UUID} - - cd /data/screenly - /usr/bin/python server.py -} - -run_websocket () { - cd /data/screenly - /usr/bin/python websocket_server_layer.py -} - -run_celery () { - cd /data/screenly - celery worker -A server.celery -B -n worker@screenly --loglevel=info --schedule /tmp/celerybeat-schedule -} - -if [[ "$SCREENLYSERVICE" = "server" ]]; then - run_setup - run_server -fi - -if [[ "$SCREENLYSERVICE" = "viewer" ]]; then - run_viewer -fi - -if [[ "$SCREENLYSERVICE" = "websocket" ]]; then - run_websocket -fi - -if [[ "$SCREENLYSERVICE" = "celery" ]]; then - run_celery -fi diff --git a/bin/start_server.sh b/bin/start_server.sh new file mode 100755 index 000000000..ad46b2bdc --- /dev/null +++ b/bin/start_server.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +# If we're running inside Balena +if [ -n ${BALENA_DEVICE_UUID+x} ]; then + mkdir -p \ + /data/.config \ + /data/.screenly \ + /data/screenly_assets + + cp -n /usr/src/app/ansible/roles/screenly/files/screenly.conf /data/.screenly/screenly.conf + cp -n /usr/src/app/ansible/roles/screenly/files/default_assets.yml /data/.screenly/default_assets.yml + cp -n /usr/src/app/ansible/roles/screenly/files/screenly.db /data/.screenly/screenly.db + + if [ -n "${OVERWRITE_CONFIG}" ]; then + echo "Requested to overwrite Screenly config file." + cp /usr/src/app/ansible/roles/screenly/files/screenly.conf "/data/.screenly/screenly.conf" + fi + + # Set management page's user and password from environment variables, + # but only if both of them are provided. Can have empty values provided. + if [ -n "${MANAGEMENT_USER+x}" ] && [ -n "${MANAGEMENT_PASSWORD+x}" ]; then + sed -i -e "s/^user=.*/user=${MANAGEMENT_USER}/" -e "s/^password=.*/password=${MANAGEMENT_PASSWORD}/" /data/.screenly/screenly.conf + fi + + echo "Running migration..." + python ./bin/migrate.py +fi diff --git a/bin/start_viewer.sh b/bin/start_viewer.sh old mode 100644 new mode 100755 index 94b2d0706..97234b019 --- a/bin/start_viewer.sh +++ b/bin/start_viewer.sh @@ -1,10 +1,10 @@ #!/bin/bash # SUGUSR1 from the viewer is also sent to the container -# Prevent it so that the container does not fall +# Prevent it so that the container does not fail trap '' 16 -su - pi -c "cd /home/pi/screenly && QT_QPA_EGLFS_FORCE888=1 dbus-run-session python viewer.py &" +dbus-run-session python viewer.py & # Waiting for the viewer while true; do diff --git a/docker-compose.yml b/docker-compose.yml index d80281862..1e13e85ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,12 +4,10 @@ services: screenly-ose-server: build: context: . - dockerfile: docker/Dockerfile.server.template + dockerfile: docker/Dockerfile.server environment: - HOME=/data - LISTEN=0.0.0.0 - - PYTHONPATH=/data/screenly - - SCREENLYSERVICE=server - CELERY_BROKER_URL=redis://redis:6379/0 - CELERY_RESULT_BACKEND=redis://redis:6379/0 ports: @@ -22,14 +20,12 @@ services: screenly-ose-viewer: build: context: . - dockerfile: docker/Dockerfile.viewer.template + dockerfile: docker/Dockerfile.viewer depends_on: - screenly-ose-server environment: - HOME=/data - NOREFRESH=1 - - PYTHONPATH=/data/screenly - - SCREENLYSERVICE=viewer - LISTEN=screenly-ose-server - PORT=80 - QT_QPA_PLATFORM=eglfs @@ -42,13 +38,11 @@ services: screenly-ose-websocket: build: context: . - dockerfile: docker/Dockerfile.websocket.template + dockerfile: docker/Dockerfile.websocket depends_on: - screenly-ose-server environment: - HOME=/data - - PYTHONPATH=/data/screenly - - SCREENLYSERVICE=websocket - LISTEN=screenly-ose-server ports: - 9999:9999 @@ -66,7 +60,6 @@ services: - redis environment: - HOME=/data - - PYTHONPATH=/data/screenly - CELERY_BROKER_URL=redis://redis:6379/0 - CELERY_RESULT_BACKEND=redis://redis:6379/0 privileged: true @@ -77,7 +70,7 @@ services: redis: build: context: . - dockerfile: docker/Dockerfile.redis.template + dockerfile: docker/Dockerfile.redis restart: always volumes: diff --git a/docker/Dockerfile.celery.template b/docker/Dockerfile.celery.template deleted file mode 100644 index dd35a8a28..000000000 --- a/docker/Dockerfile.celery.template +++ /dev/null @@ -1,30 +0,0 @@ -FROM balenalib/%%BALENA_MACHINE_NAME%%-debian:buster - -RUN apt-get update && \ - apt-get -y install --no-install-recommends \ - build-essential \ - curl \ - git-core \ - libffi-dev \ - libssl-dev \ - net-tools \ - omxplayer \ - psmisc \ - python-dev \ - python-gobject \ - python-pip \ - python-setuptools \ - python-pil \ - python-simplejson \ - libraspberrypi0 \ - ifupdown \ - sqlite3 && \ - apt-get clean - -# Install Python requirements -ADD requirements/requirements.txt /tmp/requirements.txt -RUN pip install -U -r /tmp/requirements.txt - -COPY . /tmp/screenly - -CMD ["bash", "/tmp/screenly/bin/start_balena.sh"] diff --git a/docker/Dockerfile.redis.template b/docker/Dockerfile.redis.template deleted file mode 100644 index 2bcb3a9e4..000000000 --- a/docker/Dockerfile.redis.template +++ /dev/null @@ -1,8 +0,0 @@ -FROM balenalib/%%BALENA_MACHINE_NAME%%-debian:buster - -RUN apt-get update && \ - apt-get -y install --no-install-recommends \ - redis-server && \ - apt-get clean - -CMD ["redis-server"] diff --git a/docker/Dockerfile.server b/docker/Dockerfile.server index 5640a54b6..a1bf7f839 100644 --- a/docker/Dockerfile.server +++ b/docker/Dockerfile.server @@ -1,5 +1,9 @@ FROM balenalib/rpi-raspbian:buster +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 + RUN apt-get update && \ apt-get -y install --no-install-recommends \ build-essential \ @@ -22,22 +26,11 @@ RUN apt-get update && \ && \ apt-get clean -# Install Python requirements ADD requirements/requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt -# Create runtime user -RUN useradd pi - -# Install config file and file structure -RUN mkdir -p /home/pi/.screenly /home/pi/screenly /home/pi/screenly_assets -COPY ansible/roles/screenly/files/default_assets.yml /home/pi/.screenly/default_assets.yml -COPY ansible/roles/screenly/files/screenly.conf /home/pi/.screenly/screenly.conf -RUN chown -R pi:pi /home/pi/.screenly /home/pi/screenly_assets +RUN mkdir -p /usr/src/app +COPY . /usr/src/app/ +WORKDIR /usr/src/app -USER pi -WORKDIR /home/pi/screenly - -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 +CMD ["bash", "bin/start_server.sh"] diff --git a/docker/Dockerfile.server.template b/docker/Dockerfile.server.template deleted file mode 100644 index 28acb7e14..000000000 --- a/docker/Dockerfile.server.template +++ /dev/null @@ -1,37 +0,0 @@ -FROM balenalib/%%BALENA_MACHINE_NAME%%-debian:buster - -RUN apt-get update && \ - apt-get -y install --no-install-recommends \ - build-essential \ - curl \ - ffmpeg \ - git \ - libffi-dev \ - libssl-dev \ - lsb-release \ - mplayer \ - net-tools \ - procps \ - python-pip \ - python-setuptools \ - python-dev \ - python-gobject \ - python-pil \ - python-simplejson \ - sqlite3 \ - && \ - apt-get clean - -# Install Python requirements -ADD requirements/requirements.txt /tmp/requirements.txt -RUN pip install --no-cache-dir -r /tmp/requirements.txt -ADD requirements/requirements.dev.txt /tmp/requirements.dev.txt -RUN pip install --no-cache-dir -r /tmp/requirements.dev.txt - -# Setup nginx -RUN rm /etc/nginx/sites-enabled/default -COPY ansible/roles/ssl/files/nginx_resin.conf /etc/nginx/sites-enabled/screenly.conf - -COPY . /tmp/screenly - -CMD ["bash", "/tmp/screenly/bin/start_balena.sh"] diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index d7fdc638e..6ddfd1594 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -1,7 +1,7 @@ FROM balenalib/rpi-raspbian:stretch RUN apt-get update && \ - apt-get -y install \ + apt-get -y install --no-install-recommends \ build-essential \ curl \ git-core \ @@ -23,8 +23,6 @@ RUN apt-get update && \ sqlite3 && \ apt-get clean -RUN pip install --upgrade pip - # Install Python requirements ADD requirements/requirements.viewer.txt /tmp/requirements.viewer.txt RUN pip install -r /tmp/requirements.viewer.txt @@ -51,7 +49,10 @@ RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 +# Environment varaibles ENV QT_QPA_PLATFORM eglfs +ENV QT_QPA_EGLFS_FORCE888=1 +ENV NOREFRESH 1 # Fix white flickering in omxplayer RUN mkdir /usr/local/share/ScreenlyWebview RUN curl -L \ @@ -62,13 +63,8 @@ RUN tar -xzf /tmp/screenly-webview-0.2.tar.gz -C /tmp RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview -# Fix white flickering in omxplayer -ENV NOREFRESH 1 - -# Create runtime user -RUN useradd pi -d /home/pi \ - && /usr/sbin/usermod -a -G video pi - -WORKDIR /home/pi/screenly +RUN mkdir -p /usr/src/app +COPY . /usr/src/app/ +WORKDIR /usr/src/app CMD ["bash", "bin/start_viewer.sh"] diff --git a/docker/Dockerfile.viewer.template b/docker/Dockerfile.viewer.template deleted file mode 100644 index d378e432c..000000000 --- a/docker/Dockerfile.viewer.template +++ /dev/null @@ -1,63 +0,0 @@ -FROM balenalib/%%BALENA_MACHINE_NAME%%-debian:buster - -RUN apt-get update && \ - apt-get -y install --no-install-recommends \ - build-essential \ - curl \ - git-core \ - gstreamer1.0-plugins-good \ - libdbus-glib-1-dev \ - libffi-dev \ - libqt5webkit5 \ - libraspberrypi0 \ - libssl-dev \ - libts-dev \ - net-tools \ - omxplayer \ - psmisc \ - python-dev \ - python-gobject \ - python-netifaces \ - python-pip \ - python-setuptools \ - sqlite3 && \ - apt-get clean - -# Install Python requirements -ADD requirements/requirements.viewer.txt /tmp/requirements.txt -RUN curl -s https://bootstrap.pypa.io/get-pip.py | python && pip install --upgrade -r /tmp/requirements.txt - -# QtBase from packages does not support eglfs -ARG PI_VERSION=pi3 -RUN curl -L \ - "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ - > /tmp/qtbase.tar.gz -RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local -RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf -RUN ldconfig - -# Fix symlinks -RUN rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1 -RUN rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 -RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so -RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1 -RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 - -RUN rm -f /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 -RUN rm -f /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 -RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so -RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 -RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 - -RUN mkdir /usr/local/share/ScreenlyWebview -RUN curl -L \ - "https://github.com/Screenly/screenly-ose-webview/releases/download/0.2/screenly-webview-0.2.tar.gz" \ - > /tmp/screenly-webview-0.2.tar.gz -RUN tar -xzf /tmp/screenly-webview-0.2.tar.gz -C /tmp - -RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res -RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview - -COPY . /tmp/screenly - -CMD ["bash", "/tmp/screenly/bin/start_balena.sh"] diff --git a/docker/Dockerfile.websocket b/docker/Dockerfile.websocket index 1f3f9674d..9e7f63de0 100644 --- a/docker/Dockerfile.websocket +++ b/docker/Dockerfile.websocket @@ -1,5 +1,9 @@ FROM balenalib/rpi-raspbian:buster +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 + RUN apt-get update && \ apt-get -y install --no-install-recommends \ build-essential \ @@ -10,20 +14,11 @@ RUN apt-get update && \ python-dev && \ apt-get clean -RUN pip install --upgrade pip - -# Install Python requirements ADD requirements/requirements-websocket.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt -# Create runtime user -RUN useradd pi - -# Install config file and file structure -RUN mkdir -p /home/pi/.screenly /home/pi/screenly /home/pi/screenly_assets -RUN chown -R pi:pi /home/pi/.screenly /home/pi/screenly_assets - -USER pi -WORKDIR /home/pi/screenly +RUN mkdir -p /usr/src/app +WORKDIR /usr/src/app +COPY . /usr/src/app/ -CMD python websocket_server_layer.py +CMD ["python", "websocket_server_layer.py"] diff --git a/docker/Dockerfile.websocket.template b/docker/Dockerfile.websocket.template deleted file mode 100644 index 0934c0a91..000000000 --- a/docker/Dockerfile.websocket.template +++ /dev/null @@ -1,18 +0,0 @@ -FROM balenalib/%%BALENA_MACHINE_NAME%%-debian:buster - -RUN apt-get update && \ - apt-get -y install --no-install-recommends \ - build-essential \ - curl \ - python-pip \ - python-setuptools \ - python-dev && \ - apt-get clean - -# Install Python requirements -ADD requirements/requirements-websocket.txt /tmp/requirements.txt -RUN pip install --no-cache-dir -r /tmp/requirements.txt - -COPY . /tmp/screenly - -CMD ["bash", "/tmp/screenly/bin/start_balena.sh"] diff --git a/docs/developer-documentation.md b/docs/developer-documentation.md index a18fa93ff..64affba53 100644 --- a/docs/developer-documentation.md +++ b/docs/developer-documentation.md @@ -22,6 +22,10 @@ There are currently three versions of Screenly-OSE.. | Experimental | [experimental](https://github.com/Screenly/screenly-ose/tree/experimental) | This is the branch with the experimental browser version mentioned above | +### Docker and Directories + +/ + ### Directories, files and their purpose with regards to Screenly ``` From de2f27ed16585150b7cf5fbd76bd0f16654b15cb Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 15:07:48 +0000 Subject: [PATCH 041/224] Minor renaming. --- docker-compose.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1e13e85ec..37901825d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,6 @@ -# This is the docker-compose file for Balena. version: "2" services: - screenly-ose-server: + srly-ose-server: build: context: . dockerfile: docker/Dockerfile.server @@ -17,16 +16,16 @@ services: volumes: - resin-data:/data - screenly-ose-viewer: + srly-ose-viewer: build: context: . dockerfile: docker/Dockerfile.viewer depends_on: - - screenly-ose-server + - srly-ose-server environment: - HOME=/data - NOREFRESH=1 - - LISTEN=screenly-ose-server + - LISTEN=srly-ose-server - PORT=80 - QT_QPA_PLATFORM=eglfs network_mode: "host" @@ -35,15 +34,15 @@ services: volumes: - resin-data:/data - screenly-ose-websocket: + srly-ose-websocket: build: context: . dockerfile: docker/Dockerfile.websocket depends_on: - - screenly-ose-server + - srly-ose-server environment: - HOME=/data - - LISTEN=screenly-ose-server + - LISTEN=srly-ose-server ports: - 9999:9999 privileged: true @@ -51,12 +50,12 @@ services: volumes: - resin-data:/data - screenly-ose-celery: + srly-ose-celery: build: context: . dockerfile: docker/Dockerfile.celery depends_on: - - screenly-ose-server + - srly-ose-server - redis environment: - HOME=/data From 7eda9dcb91704a3e9542f33723f5bbd1a61adf2a Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 15:08:02 +0000 Subject: [PATCH 042/224] Don't specify lang --- docker/Dockerfile.websocket | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker/Dockerfile.websocket b/docker/Dockerfile.websocket index 9e7f63de0..2dd479de3 100644 --- a/docker/Dockerfile.websocket +++ b/docker/Dockerfile.websocket @@ -1,9 +1,5 @@ FROM balenalib/rpi-raspbian:buster -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 - RUN apt-get update && \ apt-get -y install --no-install-recommends \ build-essential \ From 2885bcf3b04a76c7109085c216f63073dbac78e2 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 15:08:10 +0000 Subject: [PATCH 043/224] Adds balena file --- balena.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 balena.yml diff --git a/balena.yml b/balena.yml new file mode 100644 index 000000000..b4fee215b --- /dev/null +++ b/balena.yml @@ -0,0 +1 @@ +repoUrl: "https://github.com/screenly/screenly-ose" From 6d0d3b41dd4afeec34fdf2bb0e33efa289b23ddd Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 15:10:05 +0000 Subject: [PATCH 044/224] Removes more unneded lines. --- docker/Dockerfile.server | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker/Dockerfile.server b/docker/Dockerfile.server index a1bf7f839..e360b86b4 100644 --- a/docker/Dockerfile.server +++ b/docker/Dockerfile.server @@ -1,9 +1,5 @@ FROM balenalib/rpi-raspbian:buster -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 - RUN apt-get update && \ apt-get -y install --no-install-recommends \ build-essential \ From fc9800f718b7d1c71980a8212009713c129479f8 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 15:11:29 +0000 Subject: [PATCH 045/224] Minor formating change. --- docker-compose.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 37901825d..3d546863b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,7 +15,6 @@ services: restart: always volumes: - resin-data:/data - srly-ose-viewer: build: context: . @@ -27,13 +26,11 @@ services: - NOREFRESH=1 - LISTEN=srly-ose-server - PORT=80 - - QT_QPA_PLATFORM=eglfs network_mode: "host" privileged: true restart: always volumes: - resin-data:/data - srly-ose-websocket: build: context: . @@ -49,7 +46,6 @@ services: restart: always volumes: - resin-data:/data - srly-ose-celery: build: context: . @@ -65,7 +61,6 @@ services: restart: always volumes: - resin-data:/data - redis: build: context: . From d43b821904a3f32d36ca7eda76248b8a9f2c157a Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 15:12:45 +0000 Subject: [PATCH 046/224] Temporarily disables celery. --- docker-compose.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3d546863b..4e0dbc88a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,21 +46,21 @@ services: restart: always volumes: - resin-data:/data - srly-ose-celery: - build: - context: . - dockerfile: docker/Dockerfile.celery - depends_on: - - srly-ose-server - - redis - environment: - - HOME=/data - - CELERY_BROKER_URL=redis://redis:6379/0 - - CELERY_RESULT_BACKEND=redis://redis:6379/0 - privileged: true - restart: always - volumes: - - resin-data:/data +# srly-ose-celery: +# build: +# context: . +# dockerfile: docker/Dockerfile.celery +# depends_on: +# - srly-ose-server +# - redis +# environment: +# - HOME=/data +# - CELERY_BROKER_URL=redis://redis:6379/0 +# - CELERY_RESULT_BACKEND=redis://redis:6379/0 +# privileged: true +# restart: always +# volumes: +# - resin-data:/data redis: build: context: . From b6fab90aed836e902c2591a5fb119b9ecc97be48 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 15:15:26 +0000 Subject: [PATCH 047/224] Fixes exclude --- .gitignore | 1 - docker/Dockerfile.celery | 37 +++++++++++++++++++++++++++++++++++++ docker/Dockerfile.redis | 8 ++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 docker/Dockerfile.celery create mode 100644 docker/Dockerfile.redis diff --git a/.gitignore b/.gitignore index b61fdde00..92c503f5d 100644 --- a/.gitignore +++ b/.gitignore @@ -41,5 +41,4 @@ node_modules .git/* .github/ -docker/* docks/* diff --git a/docker/Dockerfile.celery b/docker/Dockerfile.celery new file mode 100644 index 000000000..1f4c2116a --- /dev/null +++ b/docker/Dockerfile.celery @@ -0,0 +1,37 @@ +FROM balenalib/rpi-raspbian:buster + +RUN apt-get update && \ + apt-get -y install --no-install-recommends \ + build-essential \ + curl \ + git-core \ + libffi-dev \ + libssl-dev \ + net-tools \ + omxplayer \ + psmisc \ + python-dev \ + python-gobject \ + python-pip \ + python-setuptools \ + python-pil \ + python-simplejson \ + libraspberrypi0 \ + ifupdown \ + sqlite3 && \ + apt-get clean + +ADD requirements/requirements.txt /tmp/requirements.txt +RUN pip install -U -r /tmp/requirements.txt + +RUN mkdir -p /usr/src/app +WORKDIR /usr/src/app +COPY . /usr/src/app/ + + +CMD celery worker \ + -A server.celery \ + -B -n worker@screenly \ + --loglevel=info \ + --schedule \ + /tmp/celerybeat-schedule diff --git a/docker/Dockerfile.redis b/docker/Dockerfile.redis new file mode 100644 index 000000000..0c750faa6 --- /dev/null +++ b/docker/Dockerfile.redis @@ -0,0 +1,8 @@ +FROM balenalib/rpi-raspbian:buster + +RUN apt-get update && \ + apt-get -y install --no-install-recommends \ + redis-server && \ + apt-get clean + +CMD ["redis-server"] From af45fe454de85a63a2a205843f8fffa8b40580ef Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 15:16:05 +0000 Subject: [PATCH 048/224] facepalm. --- .dockerignore | 2 ++ docker-compose.yml | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.dockerignore b/.dockerignore index 46d5d75a7..b33298c01 100644 --- a/.dockerignore +++ b/.dockerignore @@ -37,3 +37,5 @@ pip-log.txt .sass-cache/* node_modules venv + +docker/* diff --git a/docker-compose.yml b/docker-compose.yml index 4e0dbc88a..3d546863b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,21 +46,21 @@ services: restart: always volumes: - resin-data:/data -# srly-ose-celery: -# build: -# context: . -# dockerfile: docker/Dockerfile.celery -# depends_on: -# - srly-ose-server -# - redis -# environment: -# - HOME=/data -# - CELERY_BROKER_URL=redis://redis:6379/0 -# - CELERY_RESULT_BACKEND=redis://redis:6379/0 -# privileged: true -# restart: always -# volumes: -# - resin-data:/data + srly-ose-celery: + build: + context: . + dockerfile: docker/Dockerfile.celery + depends_on: + - srly-ose-server + - redis + environment: + - HOME=/data + - CELERY_BROKER_URL=redis://redis:6379/0 + - CELERY_RESULT_BACKEND=redis://redis:6379/0 + privileged: true + restart: always + volumes: + - resin-data:/data redis: build: context: . From c7417cf617cd8441b1cf87919f258e89db14627c Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 15:54:07 +0000 Subject: [PATCH 049/224] Makes dependency install consistent. --- docker/Dockerfile.celery | 2 +- docker/Dockerfile.viewer | 4 ++-- requirements/requirements.viewer.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile.celery b/docker/Dockerfile.celery index 1f4c2116a..dffe076fe 100644 --- a/docker/Dockerfile.celery +++ b/docker/Dockerfile.celery @@ -22,7 +22,7 @@ RUN apt-get update && \ apt-get clean ADD requirements/requirements.txt /tmp/requirements.txt -RUN pip install -U -r /tmp/requirements.txt +RUN pip install --no-cache-dir -r /tmp/requirements.txt RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index 6ddfd1594..7f74db3a2 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -1,4 +1,4 @@ -FROM balenalib/rpi-raspbian:stretch +FROM balenalib/rpi-raspbian:buster RUN apt-get update && \ apt-get -y install --no-install-recommends \ @@ -25,7 +25,7 @@ RUN apt-get update && \ # Install Python requirements ADD requirements/requirements.viewer.txt /tmp/requirements.viewer.txt -RUN pip install -r /tmp/requirements.viewer.txt +RUN pip install --no-cache-dir -r /tmp/requirements.viewer.txt # QtBase from packages does not support eglfs ARG PI_VERSION=pi1 diff --git a/requirements/requirements.viewer.txt b/requirements/requirements.viewer.txt index 929b968ec..3fced0365 100644 --- a/requirements/requirements.viewer.txt +++ b/requirements/requirements.viewer.txt @@ -1,7 +1,7 @@ certifi==2020.6.20 configparser==4.0.2 cryptography==3.2.1 -flask==0.12.2 +Flask==1.1.2 idna==2.6 mixpanel==4.7.0 netifaces==0.10.9 From ef8ca23e8512cff2a9dfa9fa138e597bbe01caf4 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 17:55:36 +0000 Subject: [PATCH 050/224] More build fixes --- docker/Dockerfile.viewer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index 7f74db3a2..ff0ec1ced 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -5,7 +5,7 @@ RUN apt-get update && \ build-essential \ curl \ git-core \ - gstreamer0.10-plugins-good \ + gstreamer1.0-plugins-good \ libdbus-glib-1-dev \ libffi-dev \ libqt5webkit5 \ From f1f3dee8cccfcbed152c4166c648295814f24063 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 18:05:40 +0000 Subject: [PATCH 051/224] Adds dependency --- docker/Dockerfile.viewer | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index ff0ec1ced..40b12296d 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -15,6 +15,7 @@ RUN apt-get update && \ net-tools \ omxplayer \ psmisc \ + ca-certificates \ python-dev \ python-gobject \ python-netifaces \ From 9191622660ad41340f73c1968c7b649a653afc1a Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 18:30:24 +0000 Subject: [PATCH 052/224] Switch to wget because curl chokes on certificates and i don't have energy to troubleshoot it. --- docker/Dockerfile.viewer | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index 40b12296d..35081bbd6 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -3,7 +3,7 @@ FROM balenalib/rpi-raspbian:buster RUN apt-get update && \ apt-get -y install --no-install-recommends \ build-essential \ - curl \ + wget \ git-core \ gstreamer1.0-plugins-good \ libdbus-glib-1-dev \ @@ -30,9 +30,9 @@ RUN pip install --no-cache-dir -r /tmp/requirements.viewer.txt # QtBase from packages does not support eglfs ARG PI_VERSION=pi1 -RUN curl -L \ +RUN wget \ "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ - > /tmp/qtbase.tar.gz + -O /tmp/qtbase.tar.gz RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf RUN ldconfig From 457ecef0fb95b72c512907621a73084e2c5d3f1f Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 18:44:42 +0000 Subject: [PATCH 053/224] More debugging. --- docker/Dockerfile.viewer | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index 35081bbd6..f532459b0 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -32,23 +32,24 @@ RUN pip install --no-cache-dir -r /tmp/requirements.viewer.txt ARG PI_VERSION=pi1 RUN wget \ "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ - -O /tmp/qtbase.tar.gz -RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local -RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf -RUN ldconfig + --quiet -O /tmp/qtbase.tar.gz && \ + tar -xzf /tmp/qtbase.tar.gz -C /usr/local && \ + rm /tmp/qtbase.tar.gz + echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf && \ + ldconfig # Fix symlinks -RUN rm /usr/lib/arm-linux-gnueabihf/libEGL.so.1 -RUN rm /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 -RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so -RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1 -RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 +#RUN rm /usr/lib/arm-linux-gnueabihf/libEGL.so.1 +#RUN rm /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 +#RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so +#RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1 +#RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 -RUN rm /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 -RUN rm /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 -RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so -RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 -RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 +#RUN rm /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 +#RUN rm /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 +#RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so +#RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 +#RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 # Environment varaibles ENV QT_QPA_PLATFORM eglfs From 66e1fb57ca85c7bfa2db2723986d905c93cab678 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 18:48:07 +0000 Subject: [PATCH 054/224] Formatting fix. --- docker/Dockerfile.viewer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index f532459b0..be7f0fd66 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -34,7 +34,7 @@ RUN wget \ "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ --quiet -O /tmp/qtbase.tar.gz && \ tar -xzf /tmp/qtbase.tar.gz -C /usr/local && \ - rm /tmp/qtbase.tar.gz + rm /tmp/qtbase.tar.gz && \ echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf && \ ldconfig From 6e1e7da4c4fba44bc94f4960dbb272e8119f2ecc Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Mon, 9 Nov 2020 19:01:43 +0000 Subject: [PATCH 055/224] Forgot to remove Curl in second place --- docker/Dockerfile.viewer | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index be7f0fd66..cd260e19b 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -56,14 +56,13 @@ ENV QT_QPA_PLATFORM eglfs ENV QT_QPA_EGLFS_FORCE888=1 ENV NOREFRESH 1 # Fix white flickering in omxplayer -RUN mkdir /usr/local/share/ScreenlyWebview -RUN curl -L \ +RUN mkdir -p /usr/local/share/ScreenlyWebview +RUN wget \ "https://github.com/Screenly/screenly-ose-webview/releases/download/0.2/screenly-webview-0.2.tar.gz" \ - > /tmp/screenly-webview-0.2.tar.gz -RUN tar -xzf /tmp/screenly-webview-0.2.tar.gz -C /tmp - -RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res -RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview + -O /tmp/screenly-webview-0.2.tar.gz && \ + tar -xzf /tmp/screenly-webview-0.2.tar.gz -C /tmp && \ + cp -r /tmp/res /usr/local/share/ScreenlyWebview/res && \ + cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview RUN mkdir -p /usr/src/app COPY . /usr/src/app/ From dafe406132ce722b70d1eb99ae90241858d6ce8e Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Tue, 10 Nov 2020 09:05:50 +0000 Subject: [PATCH 056/224] More cleanup and bug fiexes. --- bin/start_server.sh | 2 ++ docker/Dockerfile.redis | 2 +- docker/Dockerfile.server.dev | 4 ---- docker/Dockerfile.viewer | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/bin/start_server.sh b/bin/start_server.sh index ad46b2bdc..e97d6d565 100755 --- a/bin/start_server.sh +++ b/bin/start_server.sh @@ -25,3 +25,5 @@ if [ -n ${BALENA_DEVICE_UUID+x} ]; then echo "Running migration..." python ./bin/migrate.py fi + +python server.py diff --git a/docker/Dockerfile.redis b/docker/Dockerfile.redis index 0c750faa6..4ac3a4677 100644 --- a/docker/Dockerfile.redis +++ b/docker/Dockerfile.redis @@ -5,4 +5,4 @@ RUN apt-get update && \ redis-server && \ apt-get clean -CMD ["redis-server"] +CMD ["redis-server", "--protected-mode", "no"] diff --git a/docker/Dockerfile.server.dev b/docker/Dockerfile.server.dev index e899e3530..8982e4b36 100644 --- a/docker/Dockerfile.server.dev +++ b/docker/Dockerfile.server.dev @@ -40,10 +40,6 @@ RUN chown -R pi:pi /home/pi/.screenly /home/pi/screenly_assets USER pi WORKDIR /home/pi/screenly -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 - EXPOSE 8080 CMD python server.py diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index cd260e19b..0195b9056 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -59,7 +59,7 @@ ENV NOREFRESH 1 # Fix white flickering in omxplayer RUN mkdir -p /usr/local/share/ScreenlyWebview RUN wget \ "https://github.com/Screenly/screenly-ose-webview/releases/download/0.2/screenly-webview-0.2.tar.gz" \ - -O /tmp/screenly-webview-0.2.tar.gz && \ + --quiet -O /tmp/screenly-webview-0.2.tar.gz && \ tar -xzf /tmp/screenly-webview-0.2.tar.gz -C /tmp && \ cp -r /tmp/res /usr/local/share/ScreenlyWebview/res && \ cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview From 61cce0e1972e5e20a380a8a16a55c184cb956e24 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 11 Nov 2020 09:54:25 +0000 Subject: [PATCH 057/224] Migrates in webview into repo --- .github/workflows/ci.yaml.disabled | 42 ++++++ .github/workflows/docker-builds.yaml.disabled | 141 ++++++++++++++++++ .gitignore | 1 - docker/Dockerfile.viewer | 58 ++++--- webview/.gitignore | 44 ++++++ webview/ScreenlyWebview.pro | 18 +++ webview/build.sh | 10 ++ webview/res/Roboto-Regular.ttf | Bin 0 -> 171676 bytes webview/res/access_denied.html | 66 ++++++++ webview/res/lock.png | Bin 0 -> 2769 bytes webview/res/screenly-logo.png | Bin 0 -> 27719 bytes webview/src/deployment.pri | 9 ++ webview/src/main.cpp | 36 +++++ webview/src/mainwindow.cpp | 36 +++++ webview/src/mainwindow.h | 21 +++ webview/src/view.cpp | 65 ++++++++ webview/src/view.h | 23 +++ 17 files changed, 539 insertions(+), 31 deletions(-) create mode 100644 .github/workflows/ci.yaml.disabled create mode 100644 .github/workflows/docker-builds.yaml.disabled create mode 100644 webview/.gitignore create mode 100644 webview/ScreenlyWebview.pro create mode 100755 webview/build.sh create mode 100644 webview/res/Roboto-Regular.ttf create mode 100755 webview/res/access_denied.html create mode 100644 webview/res/lock.png create mode 100644 webview/res/screenly-logo.png create mode 100644 webview/src/deployment.pri create mode 100644 webview/src/main.cpp create mode 100644 webview/src/mainwindow.cpp create mode 100644 webview/src/mainwindow.h create mode 100644 webview/src/view.cpp create mode 100644 webview/src/view.h diff --git a/.github/workflows/ci.yaml.disabled b/.github/workflows/ci.yaml.disabled new file mode 100644 index 000000000..3ca1c7edb --- /dev/null +++ b/.github/workflows/ci.yaml.disabled @@ -0,0 +1,42 @@ +name: ci + +on: + push: +jobs: + buildx: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Set up Docker Buildx + id: buildx + uses: crazy-max/ghaction-docker-buildx@v3 + with: + buildx-version: latest + qemu-version: latest + + - name: Available platforms + run: echo ${{ steps.buildx.outputs.platforms }} + + - name: Run Buildx + run: | + docker buildx build \ + --platform linux/arm/v7 \ + --load \ + -t "screenly-ose-webview-builder" \ + --file Dockerfile . + + - name: Make artifacts folder + run: mkdir -p artifacts + + - name: Run webviewer build + run: | + docker run \ + -v $(pwd)/artifacts:/build \ + screenly-ose-webview-builder build.sh + + - uses: actions/upload-artifact@v2 + with: + name: build-artifacts + path: artifacts diff --git a/.github/workflows/docker-builds.yaml.disabled b/.github/workflows/docker-builds.yaml.disabled new file mode 100644 index 000000000..9149664f5 --- /dev/null +++ b/.github/workflows/docker-builds.yaml.disabled @@ -0,0 +1,141 @@ +name: ci + +on: + pull_request: + branches: + - experimental + - experimental-fixes + push: + branches: + - experimental + - experimental-fixes + +jobs: + build: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + buildx-version: + - latest + - v0.2.2 + qemu-version: + - latest + - 4.2.0-7 + steps: + - name: Runner info + run: | + sudo apt-get install -y hwinfo + sudo hwinfo --short + sudo mount + - name: Set up Docker Buildx + id: buildx + uses: ./ + with: + buildx-version: ${{ matrix.buildx-version }} + qemu-version: ${{ matrix.qemu-version }} + - name: Available platforms + run: echo ${{ steps.buildx.outputs.platforms }} + - + name: Run Buildx + run: | + docker buildx build \ + --platform linux/arm/v6,linux/arm/v7 \ + --output "type=image,push=false" \ + --file ./test/Dockerfile ./test + - + name: Run Buildx (sudo) + run: | + docker buildx build \ + --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x \ + --output "type=image,push=false" \ + --file ./test/Dockerfile-sudo ./test + + cache: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2.3.3 + - + name: Set up Docker Buildx + id: buildx + uses: ./ + - + name: Cache Docker layers + uses: actions/cache@v2 + id: cache + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - + name: Docker Buildx (build) + run: | + docker buildx build \ + --cache-from "type=local,src=/tmp/.buildx-cache" \ + --cache-to "type=local,dest=/tmp/.buildx-cache" \ + --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x \ + --output "type=image,push=false" \ + --tag crazymax/ghaction-docker-buildx:cache \ + --file ./test/Dockerfile-diun ./test + - + name: Login to DockerHub + if: success() && github.event_name != 'pull_request' + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - + name: Docker Buildx (push) + if: success() && github.event_name != 'pull_request' + run: | + docker buildx build \ + --cache-from "type=local,src=/tmp/.buildx-cache" \ + --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x \ + --output "type=image,push=true" \ + --tag crazymax/ghaction-docker-buildx:cache \ + --file ./test/Dockerfile-diun ./test + - + name: Inspect image + if: always() && github.event_name != 'pull_request' + run: | + docker buildx imagetools inspect crazymax/ghaction-docker-buildx:cache + + push: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2.3.3 + - + name: Prepare + id: prepare + run: | + DOCKER_PLATFORMS=linux/arm/v6,linux/arm/v7 + VERSION=edge + + name: Set up Docker Buildx + uses: ./ + - + name: Docker Buildx (build) + run: | + docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }} + - + name: Login to DockerHub + if: success() && github.event_name != 'pull_request' + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - + name: Docker Buildx (push) + if: success() && github.event_name != 'pull_request' + run: | + docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} + - + name: Inspect image + if: always() && github.event_name != 'pull_request' + run: | + docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }} diff --git a/.gitignore b/.gitignore index 92c503f5d..adcc0e48b 100644 --- a/.gitignore +++ b/.gitignore @@ -40,5 +40,4 @@ node_modules .env .git/* -.github/ docks/* diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index 0195b9056..703e0439a 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -1,9 +1,34 @@ +FROM balenalib/rpi-raspbian:buster as viewer-builder + +RUN sed -i -e 's/#deb-src/deb-src/' /etc/apt/sources.list +RUN apt-get update && \ + apt-get -y install --no-install-recommends \ + build-essential \ + g++ \ + libinput-dev \ + libqt5gui5 \ + libqt5webkit5-dev \ + libqt5x11extras5-dev \ + libts-dev \ + libudev-dev \ + libxcb-xinerama0 \ + libxcb-xinerama0-dev \ + make && \ + apt-get clean + +WORKDIR /build + +RUN mkdir /src +COPY webview/build.sh /usr/local/bin/ +COPY webview /src +CMD /usr/local/bin/build.sh + + FROM balenalib/rpi-raspbian:buster RUN apt-get update && \ apt-get -y install --no-install-recommends \ build-essential \ - wget \ git-core \ gstreamer1.0-plugins-good \ libdbus-glib-1-dev \ @@ -28,41 +53,14 @@ RUN apt-get update && \ ADD requirements/requirements.viewer.txt /tmp/requirements.viewer.txt RUN pip install --no-cache-dir -r /tmp/requirements.viewer.txt -# QtBase from packages does not support eglfs -ARG PI_VERSION=pi1 -RUN wget \ - "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ - --quiet -O /tmp/qtbase.tar.gz && \ - tar -xzf /tmp/qtbase.tar.gz -C /usr/local && \ - rm /tmp/qtbase.tar.gz && \ - echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf && \ - ldconfig - -# Fix symlinks -#RUN rm /usr/lib/arm-linux-gnueabihf/libEGL.so.1 -#RUN rm /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 -#RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so -#RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1 -#RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 - -#RUN rm /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 -#RUN rm /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 -#RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so -#RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 -#RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 - # Environment varaibles ENV QT_QPA_PLATFORM eglfs ENV QT_QPA_EGLFS_FORCE888=1 ENV NOREFRESH 1 # Fix white flickering in omxplayer RUN mkdir -p /usr/local/share/ScreenlyWebview -RUN wget \ - "https://github.com/Screenly/screenly-ose-webview/releases/download/0.2/screenly-webview-0.2.tar.gz" \ - --quiet -O /tmp/screenly-webview-0.2.tar.gz && \ - tar -xzf /tmp/screenly-webview-0.2.tar.gz -C /tmp && \ - cp -r /tmp/res /usr/local/share/ScreenlyWebview/res && \ - cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview +COPY --from=viewer-builder /src/ScreenlyWebview /usr/local/bin/ +COPY --from=viewer-builder /src/res /usr/local/share/ScreenlyWebview/ RUN mkdir -p /usr/src/app COPY . /usr/src/app/ diff --git a/webview/.gitignore b/webview/.gitignore new file mode 100644 index 000000000..722d236a0 --- /dev/null +++ b/webview/.gitignore @@ -0,0 +1,44 @@ +#.gitignore from github +# C++ objects and libs +*.slo +*.lo +*.o +*.a +*.la +*.lai +*.so +*.dll +*.dylib + +# Qt-es +object_script.*.Release +object_script.*.Debug +*_plugin_import.cpp +/.qmake.cache +/.qmake.stash +*.pro.user +*.pro.user.* +*.qbs.user +*.qbs.user.* +*.moc +moc_*.cpp +moc_*.h +qrc_*.cpp +ui_*.h +*.qmlc +*.jsc +Makefile* +*build-* + +# Qt unit tests +target_wrapper.* + +# QtCreator +*.autosave + +# QtCreator Qml +*.qmlproject.user +*.qmlproject.user.* + +# QtCreator CMake +CMakeLists.txt.user* diff --git a/webview/ScreenlyWebview.pro b/webview/ScreenlyWebview.pro new file mode 100644 index 000000000..5b72a799b --- /dev/null +++ b/webview/ScreenlyWebview.pro @@ -0,0 +1,18 @@ +TEMPLATE = app + +QT += webkit webkitwidgets dbus +CONFIG += c++11 + +SOURCES += src/main.cpp \ + src/mainwindow.cpp \ + src/view.cpp + +# Additional import path used to resolve QML modules in Qt Creator's code model +QML_IMPORT_PATH = + +# Default rules for deployment. +include(src/deployment.pri) + +HEADERS += \ + src/mainwindow.h \ + src/view.h diff --git a/webview/build.sh b/webview/build.sh new file mode 100755 index 000000000..22953dd15 --- /dev/null +++ b/webview/build.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# vim: tabstop=4 shiftwidth=4 softtabstop=4 +# -*- sh-basic-offset: 4 -*- +set -euo pipefail + +cd /src +/usr/lib/arm-linux-gnueabihf/qt5/bin/qmake +make -j "$(nproc --all)" +make install diff --git a/webview/res/Roboto-Regular.ttf b/webview/res/Roboto-Regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..2c97eeadffe1a34bd67d3ff1c3887fd53e22c2ca GIT binary patch literal 171676 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 ZcAgz$Pp~K2ZnnEU$(~HkLK9l*e*jr~ZsGs{ literal 0 HcmV?d00001 diff --git a/webview/res/access_denied.html b/webview/res/access_denied.html new file mode 100755 index 000000000..1de6de3af --- /dev/null +++ b/webview/res/access_denied.html @@ -0,0 +1,66 @@ + + +Access denied + + + + +

+ +
+

This webpage is protected.

+

The page you're trying to open is protected.
To display it, specify the asset URL
in the following format:

+ http://username:password@example.com +
+
+ + diff --git a/webview/res/lock.png b/webview/res/lock.png new file mode 100644 index 0000000000000000000000000000000000000000..6b88521243ddd89de4651ccdd3562d3a31c0855d GIT binary patch literal 2769 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 literal 0 HcmV?d00001 diff --git a/webview/res/screenly-logo.png b/webview/res/screenly-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..b9c8113449aba414f6200fbc0b4c14e5cec07ccf GIT binary patch literal 27719 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 *_XabzDEnRJv#T+zTOAo+ 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 G1^pkuW~HG3 literal 0 HcmV?d00001 diff --git a/webview/src/deployment.pri b/webview/src/deployment.pri new file mode 100644 index 000000000..d589ad429 --- /dev/null +++ b/webview/src/deployment.pri @@ -0,0 +1,9 @@ +unix:!android { + isEmpty(target.path) { + target.path = $$(PREFIX)$${TARGET}_bin + export(target.path) + } + INSTALLS += target +} + +export(INSTALLS) diff --git a/webview/src/main.cpp b/webview/src/main.cpp new file mode 100644 index 000000000..d4047700c --- /dev/null +++ b/webview/src/main.cpp @@ -0,0 +1,36 @@ +#include +#include +#include +#include + +#include "mainwindow.h" + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + + QCursor cursor(Qt::BlankCursor); + QApplication::setOverrideCursor(cursor); + QApplication::changeOverrideCursor(cursor); + + MainWindow *window = new MainWindow(); + window->show(); + + QDBusConnection connection = QDBusConnection::sessionBus(); + + if (!connection.registerObject("/Screenly", window, QDBusConnection::ExportAllSlots)) + { + qWarning() << "Can't register object"; + return 1; + } + qDebug() << "WebView connected to D-bus"; + + if (!connection.registerService("screenly.webview")) { + qWarning() << qPrintable(QDBusConnection::sessionBus().lastError().message()); + return 1; + } + qDebug() << "Screenly service start"; + + + return app.exec(); +} diff --git a/webview/src/mainwindow.cpp b/webview/src/mainwindow.cpp new file mode 100644 index 000000000..1edced469 --- /dev/null +++ b/webview/src/mainwindow.cpp @@ -0,0 +1,36 @@ +#include +#include +#include + +#include "mainwindow.h" +#include "view.h" + + +MainWindow::MainWindow() : QMainWindow() +{ + QWebSettings::globalSettings()->setAttribute(QWebSettings::LocalStorageEnabled, true); + + QNetworkAccessManager* manager = new QNetworkAccessManager(this); + QNetworkDiskCache* diskCache = new QNetworkDiskCache(this); + QString cacheLocation = QStandardPaths::writableLocation(QStandardPaths::CacheLocation); + + diskCache->setCacheDirectory(cacheLocation); + manager->setCache(diskCache); + + + view = new View(this); + view -> page()->setNetworkAccessManager(manager); + view -> page()->mainFrame()->setScrollBarPolicy( Qt::Vertical, Qt::ScrollBarAlwaysOff ); + view -> page()->mainFrame()->setScrollBarPolicy( Qt::Horizontal, Qt::ScrollBarAlwaysOff ); + setCentralWidget(view); +} + +void MainWindow::loadPage(const QString &uri) +{ + view->loadPage(uri); +} + +void MainWindow:: loadImage(const QString &uri) +{ + view->loadImage(uri); +} diff --git a/webview/src/mainwindow.h b/webview/src/mainwindow.h new file mode 100644 index 000000000..4d2a0564d --- /dev/null +++ b/webview/src/mainwindow.h @@ -0,0 +1,21 @@ +#pragma once + +#include +#include + +#include "view.h" + +class MainWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit MainWindow(); + +public slots: + void loadPage(const QString &uri); + void loadImage(const QString &uri); + +private: + View *view; +}; diff --git a/webview/src/view.cpp b/webview/src/view.cpp new file mode 100644 index 000000000..4135a1566 --- /dev/null +++ b/webview/src/view.cpp @@ -0,0 +1,65 @@ +#include +#include +#include +#include +#include +#include +#include + +#include "view.h" + + +View::View(QWidget* parent) : QWebView(parent) +{ + // Need to convert this to a new syntax + connect(QWebView::page()->networkAccessManager(), SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), + this, SLOT(handleAuthRequest(QNetworkReply*,QAuthenticator*))); + pre_loader = new QWebPage; +} + +void View::loadPage(const QString &uri) +{ + qDebug() << "Type: Webpage"; + stop(); + load(QUrl(uri)); +} + +void View::loadImage(const QString &preUri) +{ + qDebug() << "Type: Image"; + QFileInfo fileInfo = QFileInfo(preUri); + QString uri; + + if (fileInfo.isFile()) + { + qDebug() << "Location: Local File"; + uri = QUrl::fromLocalFile(fileInfo.absoluteFilePath()).toEncoded(); + } + else if (preUri == "null") + { + qDebug() << "Black page"; + } + else + { + qDebug() << "Location: Remote URL"; + uri = preUri; + } + + QString script = "window.setimg=function(n){var o=new Image;o.onload=function()" + "{document.body.style.backgroundSize=o.width>window.innerWidth||o.height>window.innerHeight?\"contain\":\"auto\",document.body.style.backgroundImage=\"url(\"+n+\")\"},o.src=n};"; + QString styles = "background: #000 center no-repeat"; + + stop(); + pre_loader->currentFrame()->setHtml(""); + connect(pre_loader,SIGNAL(loadFinished(bool)),&pre_loader_loop,SLOT(quit())); + QTimer::singleShot(5000, &pre_loader_loop, SLOT(quit())); + pre_loader_loop.exec(); + setHtml(pre_loader->currentFrame()->toHtml()); +} + +void View::handleAuthRequest(QNetworkReply* reply, QAuthenticator* auth) +{ + Q_UNUSED(reply) + Q_UNUSED(auth) + load(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::DataLocation, "res/access_denied.html"))); +} diff --git a/webview/src/view.h b/webview/src/view.h new file mode 100644 index 000000000..ae73f4f51 --- /dev/null +++ b/webview/src/view.h @@ -0,0 +1,23 @@ +#pragma once + +#include +#include +#include +#include + +class View : public QWebView +{ + Q_OBJECT + +public: + explicit View(QWidget* parent); + + void loadPage(const QString &uri); + void loadImage(const QString &uri); + +private slots: + void handleAuthRequest(QNetworkReply*, QAuthenticator*); +private: + QWebPage* pre_loader; + QEventLoop pre_loader_loop; +}; From 10e418888e8375eea53820484b1d9fb34f593f41 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 11 Nov 2020 10:12:59 +0000 Subject: [PATCH 058/224] More build improvements. --- docker/Dockerfile.viewer | 12 ++++++------ webview/build.sh | 10 ---------- 2 files changed, 6 insertions(+), 16 deletions(-) delete mode 100755 webview/build.sh diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index 703e0439a..d5d16d7ae 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -16,12 +16,12 @@ RUN apt-get update && \ make && \ apt-get clean -WORKDIR /build - RUN mkdir /src -COPY webview/build.sh /usr/local/bin/ -COPY webview /src -CMD /usr/local/bin/build.sh +WORKDIR /src +COPY webview/ /src/ +RUN /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake +RUN make -j 4 +RUN make install FROM balenalib/rpi-raspbian:buster @@ -53,7 +53,7 @@ RUN apt-get update && \ ADD requirements/requirements.viewer.txt /tmp/requirements.viewer.txt RUN pip install --no-cache-dir -r /tmp/requirements.viewer.txt -# Environment varaibles +# Environment variables ENV QT_QPA_PLATFORM eglfs ENV QT_QPA_EGLFS_FORCE888=1 ENV NOREFRESH 1 # Fix white flickering in omxplayer diff --git a/webview/build.sh b/webview/build.sh deleted file mode 100755 index 22953dd15..000000000 --- a/webview/build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# -*- sh-basic-offset: 4 -*- -set -euo pipefail - -cd /src -/usr/lib/arm-linux-gnueabihf/qt5/bin/qmake -make -j "$(nproc --all)" -make install From d6bf8059d47d58dde83b01f6d7b6d757039b5b1e Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 11 Nov 2020 10:35:10 +0000 Subject: [PATCH 059/224] Fixes missing dependency --- docker/Dockerfile.server | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile.server b/docker/Dockerfile.server index e360b86b4..f98b649a8 100644 --- a/docker/Dockerfile.server +++ b/docker/Dockerfile.server @@ -15,6 +15,7 @@ RUN apt-get update && \ python-pip \ python-setuptools \ python-dev \ + omxplayer \ python-gobject \ python-pil \ python-simplejson \ From c938e524f003d2f59eed4d6b998656174c523e3c Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 11 Nov 2020 15:24:59 +0000 Subject: [PATCH 060/224] Minor changes to viewer --- docker/Dockerfile.viewer | 1 + docs/developer-documentation.md | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index d5d16d7ae..be2943405 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -54,6 +54,7 @@ ADD requirements/requirements.viewer.txt /tmp/requirements.viewer.txt RUN pip install --no-cache-dir -r /tmp/requirements.viewer.txt # Environment variables +ENV UDEV=1 ENV QT_QPA_PLATFORM eglfs ENV QT_QPA_EGLFS_FORCE888=1 ENV NOREFRESH 1 # Fix white flickering in omxplayer diff --git a/docs/developer-documentation.md b/docs/developer-documentation.md index 64affba53..86fe68e92 100644 --- a/docs/developer-documentation.md +++ b/docs/developer-documentation.md @@ -88,10 +88,9 @@ screenly.script -> `/other/directories/here/.. from ansible roles` -### Screenly-OSE-WebView - -The Experimental branch uses a different web browser which is maintained on a different Github repo here: -`https://github.com/Screenly/screenly-ose-webview` - -_(need more details about this process and how exactly the experimental browser is installed._ +### Debugging Screenly OSE webview +``` +export QT_LOGGING_DEBUG=1 +export QT_LOGGING_RULES="*.debug=true" +``` From 07e14d1c1f295ef7ab8a896d29fcfc013677dee9 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 11 Nov 2020 16:50:38 +0000 Subject: [PATCH 061/224] Experiment with old viewer --- docker-compose.yml | 2 +- docker/Dockerfile.viewer.bak | 64 +++++++++++++++++++ docs/developer-documentation.md | 4 ++ webview/build_qtbase.sh | 106 ++++++++++++++++++++++++++++++++ 4 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 docker/Dockerfile.viewer.bak create mode 100755 webview/build_qtbase.sh diff --git a/docker-compose.yml b/docker-compose.yml index 3d546863b..0344973b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: srly-ose-viewer: build: context: . - dockerfile: docker/Dockerfile.viewer + dockerfile: docker/Dockerfile.viewer.bak depends_on: - srly-ose-server environment: diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak new file mode 100644 index 000000000..b5005d388 --- /dev/null +++ b/docker/Dockerfile.viewer.bak @@ -0,0 +1,64 @@ +FROM balenalib/%%BALENA_MACHINE_NAME%%-debian:stretch + +RUN apt-get update && \ + apt-get -y install \ + build-essential \ + curl \ + git-core \ + gstreamer1.0-plugins-good \ + libdbus-glib-1-dev \ + libffi-dev \ + libqt5webkit5 \ + libraspberrypi0 \ + libssl-dev \ + libts-dev \ + net-tools \ + omxplayer \ + psmisc \ + python-dev \ + python-gobject \ + python-netifaces \ + python-pip \ + python-setuptools \ + sqlite3 && \ + apt-get clean + +# Install Python requirements +ADD requirements/requirements.viewer.txt /tmp/requirements.txt +RUN curl -s https://bootstrap.pypa.io/get-pip.py | python && \ + pip install --upgrade -r /tmp/requirements.txt + +# QtBase from packages does not support eglfs +ARG PI_VERSION=pi3 +RUN curl -L \ + "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ + > /tmp/qtbase.tar.gz +RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local +RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf +RUN ldconfig + +# Fix symlinks +RUN rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1 +RUN rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1 +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 + +RUN rm -f /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 +RUN rm -f /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 + +RUN mkdir /usr/local/share/ScreenlyWebview +RUN curl -L \ + "https://github.com/Screenly/screenly-ose-webview/releases/download/0.2/screenly-webview-0.2.tar.gz" \ + > /tmp/screenly-webview-0.2.tar.gz +RUN tar -xzf /tmp/screenly-webview-0.2.tar.gz -C /tmp + +RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res +RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview + +COPY . /tmp/screenly + +CMD ["bash", "/tmp/screenly/bin/start_balena.sh"] diff --git a/docs/developer-documentation.md b/docs/developer-documentation.md index 86fe68e92..3e7f83c46 100644 --- a/docs/developer-documentation.md +++ b/docs/developer-documentation.md @@ -93,4 +93,8 @@ screenly.script -> ``` export QT_LOGGING_DEBUG=1 export QT_LOGGING_RULES="*.debug=true" +export QT_QPA_EGLFS_DEBUG=1 ``` + + +export QT_QPA_EGLFS_INTEGRATION=eglfs_kms diff --git a/webview/build_qtbase.sh b/webview/build_qtbase.sh new file mode 100755 index 000000000..fd0ff5c5d --- /dev/null +++ b/webview/build_qtbase.sh @@ -0,0 +1,106 @@ +#!/bin/bash + +# vim: tabstop=4 shiftwidth=4 softtabstop=4 +# -*- sh-basic-offset: 4 -*- + +set -euo pipefail + +QT_PI_1=/src/qt5/pi_1 # For Pi 1 and Pi Zero +QT_PI_2=/src/qt5/pi_2 # For Pi 2 +QT_PI_3=/src/qt5/pi_3 # For Pi 3 +BUILD_TARGET=/build +QT_BRANCH="5.15" + +mkdir -p "$BUILD_TARGET" + +echo "Building QT Base version $QT_BRANCH." + +# For ARMv6 +if [ "$(arch)" = "armv6l" ]; then + if [ ! -f "$BUILD_TARGET/qtbase-pi1.tar.gz" ]; then + echo "Building QT Base for Pi 1" + mkdir -p "$QT_PI_1" + cd "$QT_PI_1" + git clone git://code.qt.io/qt/qtbase.git -b "$QT_BRANCH" + cd qtbase + ./configure \ + -release \ + -opengl es2 \ + -device linux-rasp-pi-g++ \ + -device-option CROSS_COMPILE=/usr/bin/ \ + -opensource \ + -confirm-license \ + -make libs \ + -prefix /usr/local/qt5pi \ + -extprefix $QT_PI_1/qt5pi \ + -no-use-gold-linker + + make -j "$(nproc --all)" + make install + cp -r /usr/share/fonts/truetype/dejavu/ "$QT_PI_1/qt5pi/lib/fonts" + cd "$QT_PI_1" + tar -zcvf $BUILD_TARGET/qtbase-pi1.tar.gz qt5pi + cd "$BUILD_TARGET" + md5sum qtbase-pi1.tar.gz > qtbase-pi1.tar.gz.md5 + fi + +fi + +# For ARMv7 +if [ "$(arch)" = "armv7l" ]; then + + if [ ! -f "$BUILD_TARGET/qtbase-pi2.tar.gz" ]; then + echo "Building QT Base for Pi 2" + mkdir -p "$QT_PI_2" + cd "$QT_PI_2" + git clone git://code.qt.io/qt/qtbase.git -b "$QT_BRANCH" + cd qtbase + ./configure \ + -release \ + -opengl es2 \ + -device linux-rasp-pi2-g++ \ + -device-option CROSS_COMPILE=/usr/bin/ \ + -opensource \ + -confirm-license \ + -make libs \ + -prefix /usr/local/qt5pi \ + -extprefix "$QT_PI_2/qt5pi" \ + -no-use-gold-linker + + make -j "$(nproc --all)" + make install + cp -r /usr/share/fonts/truetype/dejavu/ "$QT_PI_2/qt5pi/lib/fonts" + cd "$QT_PI_2" + tar -zcvf "$BUILD_TARGET/qtbase-pi2.tar.gz" qt5pi + cd "$BUILD_TARGET" + md5sum qtbase-pi2.tar.gz > qtbase-pi2.tar.gz.md5 + fi + + if [ ! -f "$BUILD_TARGET/qtbase-pi3.tar.gz" ]; then + echo "Building QT Base for Pi 3" + mkdir -p $QT_PI_3 + cd "$QT_PI_3" + git clone git://code.qt.io/qt/qtbase.git -b "$QT_BRANCH" + cd qtbase + ./configure \ + -release \ + -opengl es2 \ + -device linux-rasp-pi3-g++ \ + -device-option CROSS_COMPILE=/usr/bin/ \ + -opensource \ + -confirm-license \ + -release \ + -make libs \ + -prefix /usr/local/qt5pi \ + -extprefix "$QT_PI_3/qt5pi" \ + -no-use-gold-linker + + make -j "$(nproc --all)" + make install + cp -r /usr/share/fonts/truetype/dejavu/ "$QT_PI_3/qt5pi/lib/fonts" + cd "$QT_PI_3" + tar -zcvf "$BUILD_TARGET/qtbase-pi3.tar.gz" qt5pi + cd "$BUILD_TARGET" + md5sum qtbase-pi3.tar.gz > qtbase-pi3.tar.gz.md5 + fi +fi From a5274ac601b8f78acb542ee1af31ce2ff3caaff4 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 11 Nov 2020 16:54:54 +0000 Subject: [PATCH 062/224] Buld tweak --- docker/Dockerfile.viewer.bak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index b5005d388..4db5be007 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -1,4 +1,4 @@ -FROM balenalib/%%BALENA_MACHINE_NAME%%-debian:stretch +FROM balenalib/rpi-raspbian:stretch RUN apt-get update && \ apt-get -y install \ From 9d1ee86c866fbf061edf6ebd0d646842b9cbc43f Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 12 Nov 2020 09:41:06 +0000 Subject: [PATCH 063/224] More troubleshooting on older version. --- docker/Dockerfile.viewer.bak | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index 4db5be007..dc87b93db 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -59,6 +59,7 @@ RUN tar -xzf /tmp/screenly-webview-0.2.tar.gz -C /tmp RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview -COPY . /tmp/screenly +RUN mkdir -p /usr/src/app +COPY . /usr/src/app/ -CMD ["bash", "/tmp/screenly/bin/start_balena.sh"] +CMD ["bash", "./bin/start_balena.sh"] From 62eeb0e938ceb40047e6ad6f772c189f7b6dd190 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 12 Nov 2020 09:48:23 +0000 Subject: [PATCH 064/224] Forgot to specify workdir --- docker/Dockerfile.viewer.bak | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index dc87b93db..d562a84f7 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -59,6 +59,7 @@ RUN tar -xzf /tmp/screenly-webview-0.2.tar.gz -C /tmp RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview +WORKDIR /usr/src/app RUN mkdir -p /usr/src/app COPY . /usr/src/app/ From 38f3d9a60bd9ec5fa21c4f1d933160032000f299 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 12 Nov 2020 09:55:26 +0000 Subject: [PATCH 065/224] Fixes path --- docker/Dockerfile.viewer.bak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index d562a84f7..bcbbf12f3 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -63,4 +63,4 @@ WORKDIR /usr/src/app RUN mkdir -p /usr/src/app COPY . /usr/src/app/ -CMD ["bash", "./bin/start_balena.sh"] +CMD ["bash", "./bin/start_viewer.sh"] From 85c3287164c8beed1f4db179249908c59f2395ae Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 12 Nov 2020 10:27:32 +0000 Subject: [PATCH 066/224] Fixes some port issues --- balena.yml | 3 +++ docker-compose.yml | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/balena.yml b/balena.yml index b4fee215b..0cb5fd994 100644 --- a/balena.yml +++ b/balena.yml @@ -1 +1,4 @@ repoUrl: "https://github.com/screenly/screenly-ose" +applicationConfigVariables: + - RESIN_HOST_CONFIG_gpu_mem: 128 + - RESIN_HOST_CONFIG_dtparam: "i2c_arm=on","spi=on","audio=on","vc4-kms-v3d" diff --git a/docker-compose.yml b/docker-compose.yml index 0344973b8..bc6292932 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,6 @@ services: environment: - HOME=/data - NOREFRESH=1 - - LISTEN=srly-ose-server - PORT=80 network_mode: "host" privileged: true @@ -39,7 +38,7 @@ services: - srly-ose-server environment: - HOME=/data - - LISTEN=srly-ose-server + - LISTEN=0.0.0.0 ports: - 9999:9999 privileged: true From 478c2a882015b66a0eb3650a4d0bc48c220c00fb Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 12 Nov 2020 13:22:19 +0000 Subject: [PATCH 067/224] Fixes up intro page --- README.md | 1 + viewer.py | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d908b69e5..0716081c4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ [![Build Status](https://travis-ci.org/Screenly/screenly-ose.svg?branch=master)](https://travis-ci.org/Screenly/screenly-ose) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/5905ebcf4aab4220ad9fdf3fb679c49d)](https://www.codacy.com/app/vpetersson/screenly-ose?utm_source=github.com&utm_medium=referral&utm_content=Screenly/screenly-ose&utm_campaign=Badge_Grade) +[![balena deploy button](https://www.balena.io/deploy.png)](https://dashboard.balena-cloud.com/deploy?repoUrl=https://github.com/screenly/screenly-ose&defaultDeviceType=raspberrypi3) # Screenly OSE - Digital Signage for the Raspberry Pi diff --git a/viewer.py b/viewer.py index 96710fd09..5bb111fa5 100755 --- a/viewer.py +++ b/viewer.py @@ -269,7 +269,7 @@ def view_webpage(uri): if current_browser_url is not uri: browser_bus.loadPage(uri) current_browser_url = uri - logging.info('current url is {0}'.format(current_browser_url)) + logging.info('Current url is {0}'.format(current_browser_url)) def view_image(uri): @@ -280,7 +280,7 @@ def view_image(uri): if current_browser_url is not uri: browser_bus.loadImage(uri) current_browser_url = uri - logging.info('current url is {0}'.format(current_browser_url)) + logging.info('Current url is {0}'.format(current_browser_url)) def view_video(uri, duration): @@ -374,7 +374,9 @@ def check_update(): def load_settings(): - """Load settings and set the log level.""" + """ + Load settings and set the log level. + """ settings.load() logging.getLogger().setLevel(logging.DEBUG if settings['debug_logging'] else logging.INFO) @@ -451,7 +453,6 @@ def setup_hotspot(): ) # Displays the hotspot page - if not path.isfile(HOME + INITIALIZED_FILE) and not gateways().get('default'): if len(wireless_connections) == 0: url = 'http://{0}/hotspot'.format(LISTEN) @@ -511,7 +512,7 @@ def main(): setup_hotspot() if settings['show_splash']: - url = 'http://{0}:{1}/splash-page'.format(LISTEN, PORT) if settings['show_splash'] else 'file://' + BLACK_PAGE + url = 'http://{0}:{1}/splash-page'.format(get_node_ip(), PORT) if settings['show_splash'] else 'file://' + BLACK_PAGE view_webpage(url) sleep(SPLASH_DELAY) From 33b77842e0d86238719dceb0bbc53dbc98630222 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 12 Nov 2020 13:43:36 +0000 Subject: [PATCH 068/224] Simplifies splash page --- lib/utils.py | 3 +-- server.py | 20 ++------------------ templates/base.html | 4 ++-- templates/splash-page.html | 6 +++--- viewer.py | 2 +- 5 files changed, 9 insertions(+), 26 deletions(-) diff --git a/lib/utils.py b/lib/utils.py index bcbc0c19b..1b223b69b 100644 --- a/lib/utils.py +++ b/lib/utils.py @@ -87,8 +87,7 @@ def get_node_ip(retry=3, timeout=1): for attempt in range(1, retry + 1): try: default_interface = gateways()['default'][AF_INET][1] - my_ip = ifaddresses(default_interface)[AF_INET][0]['addr'] - return my_ip + return ifaddresses(default_interface)[AF_INET][0]['addr'] except (KeyError, ValueError): if attempt == retry: break diff --git a/server.py b/server.py index 617c57698..5623ba6a1 100755 --- a/server.py +++ b/server.py @@ -1842,24 +1842,8 @@ def integrations(): @app.route('/splash-page') def splash_page(): - url = None - try: - my_ip = get_node_ip() - except Exception as e: - ip_lookup = False - error_msg = e - else: - ip_lookup = True - - if settings['use_ssl']: - url = 'https://{}'.format(my_ip) - elif LISTEN == '127.0.0.1': - url = "http://{}".format(my_ip) - else: - url = "http://{}:{}".format(my_ip, PORT) - - msg = url if url else error_msg - return template('splash-page.html', ip_lookup=ip_lookup, msg=msg) + my_ip = get_node_ip() + return template('splash-page.html', my_ip=get_node_ip()) @app.errorhandler(403) diff --git a/templates/base.html b/templates/base.html index 33cb65dcc..9c850cf85 100644 --- a/templates/base.html +++ b/templates/base.html @@ -17,11 +17,11 @@
- Want to get more out of Screenly? + Want to get more out of your digital signage? - Try Screenly Pro. + Try the commercial version of Screenly.
diff --git a/templates/splash-page.html b/templates/splash-page.html index 9bd5fed94..5ffac8b68 100644 --- a/templates/splash-page.html +++ b/templates/splash-page.html @@ -23,13 +23,13 @@
- {% if context.ip_lookup %} + {% if context.my_ip %}

To manage the content on this screen, just point your browser to:

- {{ context.msg }} + http://{{ context.msg }}
{% else %} -

{{ context.msg }}

+

Unable to retrieve IP

{% endif %}
diff --git a/viewer.py b/viewer.py index 5bb111fa5..97fe3eee4 100755 --- a/viewer.py +++ b/viewer.py @@ -512,7 +512,7 @@ def main(): setup_hotspot() if settings['show_splash']: - url = 'http://{0}:{1}/splash-page'.format(get_node_ip(), PORT) if settings['show_splash'] else 'file://' + BLACK_PAGE + url = 'http://{0}:{1}/splash-page'.format(LISTEN, PORT) if settings['show_splash'] else 'file://' + BLACK_PAGE view_webpage(url) sleep(SPLASH_DELAY) From 8e00b2b921d69e2bb4faac491f44cc707df84256 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 12 Nov 2020 13:50:52 +0000 Subject: [PATCH 069/224] Fixes variable reference issue --- templates/splash-page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/splash-page.html b/templates/splash-page.html index 5ffac8b68..0a9bc07d1 100644 --- a/templates/splash-page.html +++ b/templates/splash-page.html @@ -26,7 +26,7 @@ {% if context.my_ip %}

To manage the content on this screen, just point your browser to:

- http://{{ context.msg }} + http://{{ context.my_ip }}
{% else %}

Unable to retrieve IP

From 7bcb6d7bfeaeb95d278775f514caa1fdb3703730 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 13 Nov 2020 09:13:57 +0000 Subject: [PATCH 070/224] Attempts to build viewer in place --- docker/Dockerfile.viewer.bak | 36 ++++++++++++++++++++++++++++-------- docker/start.sh | 5 ----- 2 files changed, 28 insertions(+), 13 deletions(-) delete mode 100755 docker/start.sh diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index bcbbf12f3..cc2293b14 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -1,3 +1,28 @@ +FROM balenalib/rpi-raspbian:buster as viewer-builder + +RUN sed -i -e 's/#deb-src/deb-src/' /etc/apt/sources.list +RUN apt-get update && \ + apt-get -y install --no-install-recommends \ + build-essential \ + g++ \ + libinput-dev \ + libqt5gui5 \ + libqt5webkit5-dev \ + libqt5x11extras5-dev \ + libts-dev \ + libudev-dev \ + libxcb-xinerama0 \ + libxcb-xinerama0-dev \ + make && \ + apt-get clean + +RUN mkdir /src +WORKDIR /src +COPY webview/ /src/ +RUN /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake +RUN make -j 4 +RUN make install + FROM balenalib/rpi-raspbian:stretch RUN apt-get update && \ @@ -50,14 +75,9 @@ RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 -RUN mkdir /usr/local/share/ScreenlyWebview -RUN curl -L \ - "https://github.com/Screenly/screenly-ose-webview/releases/download/0.2/screenly-webview-0.2.tar.gz" \ - > /tmp/screenly-webview-0.2.tar.gz -RUN tar -xzf /tmp/screenly-webview-0.2.tar.gz -C /tmp - -RUN cp -r /tmp/res /usr/local/share/ScreenlyWebview/res -RUN cp /tmp/ScreenlyWebview /usr/local/bin/ScreenlyWebview +RUN mkdir -p /usr/local/share/ScreenlyWebview +COPY --from=viewer-builder /src/ScreenlyWebview /usr/local/bin/ +COPY --from=viewer-builder /src/res /usr/local/share/ScreenlyWebview/ WORKDIR /usr/src/app RUN mkdir -p /usr/src/app diff --git a/docker/start.sh b/docker/start.sh deleted file mode 100755 index b0008501e..000000000 --- a/docker/start.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -FILE="$DIR/../docker-compose.dev.yml" -docker-compose -f "$FILE" "$@" From a771cf555de0aaa372c73b5c54906dc60eb61e87 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 13 Nov 2020 09:33:18 +0000 Subject: [PATCH 071/224] Tries disabling qt base --- docker/Dockerfile.viewer.bak | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index cc2293b14..7cbde18f8 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -54,13 +54,13 @@ RUN curl -s https://bootstrap.pypa.io/get-pip.py | python && \ pip install --upgrade -r /tmp/requirements.txt # QtBase from packages does not support eglfs -ARG PI_VERSION=pi3 -RUN curl -L \ - "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ - > /tmp/qtbase.tar.gz -RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local -RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf -RUN ldconfig +#ARG PI_VERSION=pi3 +#RUN curl -L \ +# "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ +# > /tmp/qtbase.tar.gz +#RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local +#RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf +#RUN ldconfig # Fix symlinks RUN rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1 From e299a45f3614e992ee19e075c4928f727eeebb49 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 13 Nov 2020 09:43:41 +0000 Subject: [PATCH 072/224] Restores QT Base --- docker/Dockerfile.viewer.bak | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index 7cbde18f8..cc2293b14 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -54,13 +54,13 @@ RUN curl -s https://bootstrap.pypa.io/get-pip.py | python && \ pip install --upgrade -r /tmp/requirements.txt # QtBase from packages does not support eglfs -#ARG PI_VERSION=pi3 -#RUN curl -L \ -# "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ -# > /tmp/qtbase.tar.gz -#RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local -#RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf -#RUN ldconfig +ARG PI_VERSION=pi3 +RUN curl -L \ + "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ + > /tmp/qtbase.tar.gz +RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local +RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf +RUN ldconfig # Fix symlinks RUN rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1 From 9be753375f152a29a2615c0fa1ee90a33127baea Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 13 Nov 2020 09:57:46 +0000 Subject: [PATCH 073/224] Removes Travis --- .travis.yml | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a4a03c414..000000000 --- a/.travis.yml +++ /dev/null @@ -1,50 +0,0 @@ -language: python -python: - - "2.7" -virtualenv: - system_site_packages: true -addons: - firefox: "45.0" - apt: - update: true - packages: - - net-tools - - mplayer - - ffmpeg - - python-gobject - - python-setuptools -install: - - pip install -U pip - - pip install -r requirements/requirements.txt - - pip install -r requirements/requirements.dev.txt -before_script: - - mkdir -p ~/.screenly ~/screenly_assets /tmp/USB/cleanup_folder - - cp ansible/roles/screenly/files/screenly.conf ~/.screenly/ - - cp ansible/roles/screenly/files/screenly.db ~/.screenly/ - - sudo cp bin/install.sh /usr/local/sbin/upgrade_screenly.sh - - sudo chmod 0700 /usr/local/sbin/upgrade_screenly.sh - - echo -e "[local]\nlocalhost ansible_connection=local" > ansible/localhost - - curl https://www.screenly.io/upload/ose-logo.png > /tmp/image.png - - cp /tmp/image.png /tmp/USB/image.png - - cp /tmp/image.png /tmp/USB/cleanup_folder/image.png - - curl https://www.screenly.io/upload/ose-logo.png > ~/screenly_assets/image.tmp - - curl https://www.screenly.io/upload/big_buck_bunny_720p_10mb.flv > /tmp/video.flv - - cp tests/assets/asset.mov /tmp/asset.mov - - export DISPLAY=:99.0 - - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 - - sudo cp tests/config/ffserver.conf /etc/ffserver.conf - - /usr/bin/ffserver -f /etc/ffserver.conf & - - sleep 3 - - python server.py & - - sleep 3 # give xvfb some time to start - -script: - - find . ! -path "*/rtmplite/*" -name \*.py -exec pep8 --ignore=E402,E501,E731 {} + - - nosetests -v -a '!fixme' - - ansible-playbook --syntax-check -i ansible/localhost ansible/site.yml - - python -m SimpleHTTPServer 8081 & - - sleep 3 - - bash static/spec/runner.sh - -sudo: false -dist: xenial From abbf96307be8ceb1712742e1d85e67a5850c5291 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 13 Nov 2020 09:59:09 +0000 Subject: [PATCH 074/224] Attempts to update to Buster --- docker/Dockerfile.viewer.bak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index cc2293b14..1cd76df3a 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -23,7 +23,7 @@ RUN /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake RUN make -j 4 RUN make install -FROM balenalib/rpi-raspbian:stretch +FROM balenalib/rpi-raspbian:buster RUN apt-get update && \ apt-get -y install \ From 023bfa8798b88bde1d4d5dd9846b36f979c2d71e Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 13 Nov 2020 10:10:47 +0000 Subject: [PATCH 075/224] Tweak pip install --- docker/Dockerfile.viewer | 2 +- docker/Dockerfile.viewer.bak | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index be2943405..748d40950 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -54,7 +54,7 @@ ADD requirements/requirements.viewer.txt /tmp/requirements.viewer.txt RUN pip install --no-cache-dir -r /tmp/requirements.viewer.txt # Environment variables -ENV UDEV=1 +ENV UDEV=1 ENV QT_QPA_PLATFORM eglfs ENV QT_QPA_EGLFS_FORCE888=1 ENV NOREFRESH 1 # Fix white flickering in omxplayer diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index 1cd76df3a..2ee1e1a76 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -50,8 +50,7 @@ RUN apt-get update && \ # Install Python requirements ADD requirements/requirements.viewer.txt /tmp/requirements.txt -RUN curl -s https://bootstrap.pypa.io/get-pip.py | python && \ - pip install --upgrade -r /tmp/requirements.txt +RUN pip install --no-cache-dir -r /tmp/requirements.viewer.txt # QtBase from packages does not support eglfs ARG PI_VERSION=pi3 From 9b326c8e4e8520ab70098911cf997781fd616a78 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 13 Nov 2020 10:14:13 +0000 Subject: [PATCH 076/224] Fixes path --- docker/Dockerfile.viewer.bak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index 2ee1e1a76..c32e16669 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -50,7 +50,7 @@ RUN apt-get update && \ # Install Python requirements ADD requirements/requirements.viewer.txt /tmp/requirements.txt -RUN pip install --no-cache-dir -r /tmp/requirements.viewer.txt +RUN pip install --no-cache-dir -r /tmp/requirements.txt # QtBase from packages does not support eglfs ARG PI_VERSION=pi3 From 6974725a4cd3edbc69400a72109fa3c581aceefe Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 13 Nov 2020 10:20:01 +0000 Subject: [PATCH 077/224] Switches curl to wget --- docker/Dockerfile.viewer.bak | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index c32e16669..174880474 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -45,6 +45,7 @@ RUN apt-get update && \ python-netifaces \ python-pip \ python-setuptools \ + wget \ sqlite3 && \ apt-get clean @@ -54,9 +55,9 @@ RUN pip install --no-cache-dir -r /tmp/requirements.txt # QtBase from packages does not support eglfs ARG PI_VERSION=pi3 -RUN curl -L \ +RUN wget \ "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ - > /tmp/qtbase.tar.gz + -O /tmp/qtbase.tar.gz RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf RUN ldconfig From 229685474540cb6c7910fe1b9257023ea87173cf Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 13 Nov 2020 17:03:30 +0000 Subject: [PATCH 078/224] Tries with new qtbase on Stretc --- docker/Dockerfile.viewer.bak | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index 174880474..446db3b4c 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -55,8 +55,11 @@ RUN pip install --no-cache-dir -r /tmp/requirements.txt # QtBase from packages does not support eglfs ARG PI_VERSION=pi3 +#RUN wget \ +# "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ +# -O /tmp/qtbase.tar.gz RUN wget \ - "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ + "https://drop.vikpire.com/qt/qtbase-$PI_VERSION.tar.gz" \ -O /tmp/qtbase.tar.gz RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf From aea42986952237a2e7fa9a7c40071363c66a9669 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 13 Nov 2020 17:33:49 +0000 Subject: [PATCH 079/224] Bump. --- docker/Dockerfile.viewer.bak | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index 446db3b4c..00fac581d 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -61,6 +61,7 @@ ARG PI_VERSION=pi3 RUN wget \ "https://drop.vikpire.com/qt/qtbase-$PI_VERSION.tar.gz" \ -O /tmp/qtbase.tar.gz + RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf RUN ldconfig From 1aeeef70798f8925f4f640c6e982f824444ae23d Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 13 Nov 2020 17:39:29 +0000 Subject: [PATCH 080/224] Burst cache --- docker/Dockerfile.viewer.bak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index 00fac581d..cdc592f33 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -59,8 +59,8 @@ ARG PI_VERSION=pi3 # "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ # -O /tmp/qtbase.tar.gz RUN wget \ - "https://drop.vikpire.com/qt/qtbase-$PI_VERSION.tar.gz" \ - -O /tmp/qtbase.tar.gz + "http://drop.vikpire.com/qt/qtbase-$PI_VERSION.tar.gz" \ + -s -O /tmp/qtbase.tar.gz RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf From 0ac4f6b1671a0251bb977d690fb6016c432ee912 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 13 Nov 2020 17:46:37 +0000 Subject: [PATCH 081/224] Fixes typo --- docker/Dockerfile.viewer.bak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index cdc592f33..ee1c1b056 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -60,7 +60,7 @@ ARG PI_VERSION=pi3 # -O /tmp/qtbase.tar.gz RUN wget \ "http://drop.vikpire.com/qt/qtbase-$PI_VERSION.tar.gz" \ - -s -O /tmp/qtbase.tar.gz + -q -O /tmp/qtbase.tar.gz RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf From 1b78e37b5dfc9a638108ed1b340a77a016b5e439 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 13 Nov 2020 17:56:43 +0000 Subject: [PATCH 082/224] Switch download path --- docker/Dockerfile.viewer.bak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index ee1c1b056..282db9ac0 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -59,7 +59,7 @@ ARG PI_VERSION=pi3 # "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ # -O /tmp/qtbase.tar.gz RUN wget \ - "http://drop.vikpire.com/qt/qtbase-$PI_VERSION.tar.gz" \ + "https://storage.googleapis.com/ose-lab/qtbase-pi3.tar.gz" \ -q -O /tmp/qtbase.tar.gz RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local From a33bc8c71f11cd91ab9fbe49730bca3c3a58d295 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Sun, 15 Nov 2020 12:09:36 +0000 Subject: [PATCH 083/224] Update attempt with new QT --- docker/Dockerfile.viewer.bak | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index 282db9ac0..4bfb27d8c 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -16,10 +16,18 @@ RUN apt-get update && \ make && \ apt-get clean +RUN wget \ + "https://storage.googleapis.com/ose-lab/5.12/qtbase-pi3.tar.gz" \ + -q -O /tmp/qtbase.tar.gz + +RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local +RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf +RUN ldconfig + RUN mkdir /src WORKDIR /src COPY webview/ /src/ -RUN /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake +RUN /usr/local/qt5pi/bin/qmake RUN make -j 4 RUN make install @@ -57,9 +65,9 @@ RUN pip install --no-cache-dir -r /tmp/requirements.txt ARG PI_VERSION=pi3 #RUN wget \ # "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ -# -O /tmp/qtbase.tar.gz +# -q-O /tmp/qtbase.tar.gz RUN wget \ - "https://storage.googleapis.com/ose-lab/qtbase-pi3.tar.gz" \ + "https://storage.googleapis.com/ose-lab/5.12/qtbase-pi3.tar.gz" \ -q -O /tmp/qtbase.tar.gz RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local From 69af31244f0ee45a087982838ac47982f301861b Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Sun, 15 Nov 2020 13:25:44 +0000 Subject: [PATCH 084/224] fixes missing dep --- docker/Dockerfile.viewer.bak | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index 4bfb27d8c..2b800482e 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -13,6 +13,7 @@ RUN apt-get update && \ libudev-dev \ libxcb-xinerama0 \ libxcb-xinerama0-dev \ + wget \ make && \ apt-get clean From 279c31254fb93eb8f72c9529200ec62128529bec Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Tue, 17 Nov 2020 09:06:02 +0000 Subject: [PATCH 085/224] Reverts to previous version --- docker/Dockerfile.viewer.bak | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index 2b800482e..b3ac14155 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -1,6 +1,5 @@ FROM balenalib/rpi-raspbian:buster as viewer-builder -RUN sed -i -e 's/#deb-src/deb-src/' /etc/apt/sources.list RUN apt-get update && \ apt-get -y install --no-install-recommends \ build-essential \ @@ -18,7 +17,7 @@ RUN apt-get update && \ apt-get clean RUN wget \ - "https://storage.googleapis.com/ose-lab/5.12/qtbase-pi3.tar.gz" \ + "https://storage.googleapis.com/ose-lab/4.9/qtbase-pi3.tar.gz" \ -q -O /tmp/qtbase.tar.gz RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local @@ -68,7 +67,7 @@ ARG PI_VERSION=pi3 # "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ # -q-O /tmp/qtbase.tar.gz RUN wget \ - "https://storage.googleapis.com/ose-lab/5.12/qtbase-pi3.tar.gz" \ + "https://storage.googleapis.com/ose-lab/4.9/qtbase-pi3.tar.gz" \ -q -O /tmp/qtbase.tar.gz RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local From 8c43d31c7789eb2e05831bf893175e5dd95212bd Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Tue, 17 Nov 2020 09:53:49 +0000 Subject: [PATCH 086/224] Reverts qmake --- docker/Dockerfile.viewer.bak | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index b3ac14155..7d42f2c7d 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -27,7 +27,8 @@ RUN ldconfig RUN mkdir /src WORKDIR /src COPY webview/ /src/ -RUN /usr/local/qt5pi/bin/qmake +#RUN /usr/local/qt5pi/bin/qmake +RUN /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake RUN make -j 4 RUN make install From 76e73fdf19c6dbd92a494c49ec2e49d515a07adc Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Tue, 17 Nov 2020 15:06:33 +0000 Subject: [PATCH 087/224] QT 5.9 --- docker/Dockerfile.viewer.bak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index 7d42f2c7d..6b2d7c26b 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -17,7 +17,7 @@ RUN apt-get update && \ apt-get clean RUN wget \ - "https://storage.googleapis.com/ose-lab/4.9/qtbase-pi3.tar.gz" \ + "https://storage.googleapis.com/ose-lab/5.9/qtbase-pi3.tar.gz" \ -q -O /tmp/qtbase.tar.gz RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local @@ -68,7 +68,7 @@ ARG PI_VERSION=pi3 # "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ # -q-O /tmp/qtbase.tar.gz RUN wget \ - "https://storage.googleapis.com/ose-lab/4.9/qtbase-pi3.tar.gz" \ + "https://storage.googleapis.com/ose-lab/5.9/qtbase-pi3.tar.gz" \ -q -O /tmp/qtbase.tar.gz RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local From 85e45e59e22f305872242a43033503437b57ffee Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 18 Nov 2020 09:12:29 +0000 Subject: [PATCH 088/224] Rollback to with new QT --- docker/Dockerfile.viewer.bak | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index 6b2d7c26b..0751b0140 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -32,14 +32,40 @@ RUN /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake RUN make -j 4 RUN make install -FROM balenalib/rpi-raspbian:buster +#FROM balenalib/rpi-raspbian:buster +# +#RUN apt-get update && \ +# apt-get -y install \ +# build-essential \ +# curl \ +# git-core \ +# gstreamer1.0-plugins-good \ +# libdbus-glib-1-dev \ +# libffi-dev \ +# libqt5webkit5 \ +# libraspberrypi0 \ +# libssl-dev \ +# libts-dev \ +# net-tools \ +# omxplayer \ +# psmisc \ +# python-dev \ +# python-gobject \ +# python-netifaces \ +# python-pip \ +# python-setuptools \ +# wget \ +# sqlite3 && \ +# apt-get clean + +FROM resin/rpi-raspbian:stretch RUN apt-get update && \ apt-get -y install \ build-essential \ curl \ git-core \ - gstreamer1.0-plugins-good \ + gstreamer0.10-plugins-good \ libdbus-glib-1-dev \ libffi-dev \ libqt5webkit5 \ @@ -54,7 +80,6 @@ RUN apt-get update && \ python-netifaces \ python-pip \ python-setuptools \ - wget \ sqlite3 && \ apt-get clean From e07e225f47b243ee11e9a9377f2ad06b48c348ad Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 18 Nov 2020 09:33:03 +0000 Subject: [PATCH 089/224] Adds wget --- docker/Dockerfile.viewer.bak | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index 0751b0140..b22b148a4 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -67,6 +67,7 @@ RUN apt-get update && \ git-core \ gstreamer0.10-plugins-good \ libdbus-glib-1-dev \ + wget \ libffi-dev \ libqt5webkit5 \ libraspberrypi0 \ From 01b566942521907f537e46d5ebc8121c0124814d Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 18 Nov 2020 12:56:59 +0000 Subject: [PATCH 090/224] Attempt with QT build on Stretch --- docker/Dockerfile.viewer.bak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index b22b148a4..bd54fc816 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -17,7 +17,7 @@ RUN apt-get update && \ apt-get clean RUN wget \ - "https://storage.googleapis.com/ose-lab/5.9/qtbase-pi3.tar.gz" \ + "https://storage.googleapis.com/ose-lab/stretch/5.9/qtbase-pi3.tar.gz" \ -q -O /tmp/qtbase.tar.gz RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local @@ -94,7 +94,7 @@ ARG PI_VERSION=pi3 # "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ # -q-O /tmp/qtbase.tar.gz RUN wget \ - "https://storage.googleapis.com/ose-lab/5.9/qtbase-pi3.tar.gz" \ + "https://storage.googleapis.com/ose-lab/stretch/5.9/qtbase-pi3.tar.gz" \ -q -O /tmp/qtbase.tar.gz RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local From 94a822b1206a98989f9765411ebb4061e81940a3 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 18 Nov 2020 14:06:25 +0000 Subject: [PATCH 091/224] Tweak base image --- docker/Dockerfile.viewer.bak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak index bd54fc816..8bd041366 100644 --- a/docker/Dockerfile.viewer.bak +++ b/docker/Dockerfile.viewer.bak @@ -58,7 +58,7 @@ RUN make install # sqlite3 && \ # apt-get clean -FROM resin/rpi-raspbian:stretch +FROM balenalib/rpi-raspbian:stretch RUN apt-get update && \ apt-get -y install \ From 2d0cb2e8b8ab1c333caf2e928f3ec775f2d436e9 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 18 Nov 2020 14:40:15 +0000 Subject: [PATCH 092/224] Fixes Dockerfile and adds more documentation --- webview/Dockerfile | 30 ++++++++ webview/README.md | 19 +++++ webview/build_qtbase.sh | 159 +++++++++++++++++++--------------------- 3 files changed, 125 insertions(+), 83 deletions(-) create mode 100644 webview/Dockerfile create mode 100644 webview/README.md diff --git a/webview/Dockerfile b/webview/Dockerfile new file mode 100644 index 000000000..ffe307668 --- /dev/null +++ b/webview/Dockerfile @@ -0,0 +1,30 @@ +FROM balenalib/rpi-raspbian:stretch + +RUN echo "deb-src http://archive.raspberrypi.org/debian stretch main ui" >> /etc/apt/sources.list.d/raspi.list +RUN echo "deb-src http://archive.raspbian.org/raspbian stretch main contrib non-free rpi firmware" >> /etc/apt/sources.list + +RUN apt-get update && \ + apt-get -y install --no-install-recommends \ + build-essential \ + freetds-dev \ + g++ \ + git \ + libinput-dev \ + lsb-release \ + libqt5gui5 \ + libqt5webkit5-dev \ + libqt5x11extras5-dev \ + libraspberrypi0 \ + libraspberrypi-dev \ + libts-dev \ + libudev-dev \ + libxcb-xinerama0 \ + libxcb-xinerama0-dev \ + make && \ + apt-get build-dep libqt5gui5 && \ + apt-get clean + +WORKDIR /build + +COPY build_qtbase.sh /usr/local/bin/ +CMD /usr/local/bin/build_qtbase.sh diff --git a/webview/README.md b/webview/README.md new file mode 100644 index 000000000..9e3c76b73 --- /dev/null +++ b/webview/README.md @@ -0,0 +1,19 @@ +# QT Dependencies + +At the moment, this build will not work with cross-compiling, and needs to be done on a Raspberry Pi. + +Start by building the base image: + +``` +$ docker build -t qt-builder . +[...] +``` + +With the base image done, you can build QT Base with the following command: + +``` +$ docker run --rm -ti \ + -v $(pwd)/build:/build -ti qt-builder +``` + +This will output the files in a folder called `build/` in the current directory. diff --git a/webview/build_qtbase.sh b/webview/build_qtbase.sh index fd0ff5c5d..694bc6c31 100755 --- a/webview/build_qtbase.sh +++ b/webview/build_qtbase.sh @@ -9,98 +9,91 @@ QT_PI_1=/src/qt5/pi_1 # For Pi 1 and Pi Zero QT_PI_2=/src/qt5/pi_2 # For Pi 2 QT_PI_3=/src/qt5/pi_3 # For Pi 3 BUILD_TARGET=/build -QT_BRANCH="5.15" +QT_BRANCH="5.9" +DEBIAN_VERSION=$(lsb_release -cs) mkdir -p "$BUILD_TARGET" echo "Building QT Base version $QT_BRANCH." -# For ARMv6 -if [ "$(arch)" = "armv6l" ]; then - if [ ! -f "$BUILD_TARGET/qtbase-pi1.tar.gz" ]; then - echo "Building QT Base for Pi 1" - mkdir -p "$QT_PI_1" - cd "$QT_PI_1" - git clone git://code.qt.io/qt/qtbase.git -b "$QT_BRANCH" - cd qtbase - ./configure \ - -release \ - -opengl es2 \ - -device linux-rasp-pi-g++ \ - -device-option CROSS_COMPILE=/usr/bin/ \ - -opensource \ - -confirm-license \ - -make libs \ - -prefix /usr/local/qt5pi \ - -extprefix $QT_PI_1/qt5pi \ - -no-use-gold-linker - - make -j "$(nproc --all)" - make install - cp -r /usr/share/fonts/truetype/dejavu/ "$QT_PI_1/qt5pi/lib/fonts" - cd "$QT_PI_1" - tar -zcvf $BUILD_TARGET/qtbase-pi1.tar.gz qt5pi - cd "$BUILD_TARGET" - md5sum qtbase-pi1.tar.gz > qtbase-pi1.tar.gz.md5 - fi +if [ ! -f "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi1.tar.gz" ]; then + echo "Building QT Base for Pi 1" + mkdir -p "$QT_PI_1" + cd "$QT_PI_1" + git clone git://code.qt.io/qt/qtbase.git -b "$QT_BRANCH" + cd qtbase + ./configure \ + -release \ + -opengl es2 \ + -device linux-rasp-pi-g++ \ + -device-option CROSS_COMPILE=/usr/bin/ \ + -opensource \ + -confirm-license \ + -make libs \ + -prefix /usr/local/qt5pi \ + -extprefix $QT_PI_1/qt5pi \ + -no-use-gold-linker + make -j "$(nproc --all)" + make install + cp -r /usr/share/fonts/truetype/dejavu/ "$QT_PI_1/qt5pi/lib/fonts" + cd "$QT_PI_1" + tar -zcvf "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi1.tar.gz" qt5pi + cd "$BUILD_TARGET" + sha256sum "qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi1.tar.gz" > "qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi1.tar.gz.sha256" fi -# For ARMv7 -if [ "$(arch)" = "armv7l" ]; then - - if [ ! -f "$BUILD_TARGET/qtbase-pi2.tar.gz" ]; then - echo "Building QT Base for Pi 2" - mkdir -p "$QT_PI_2" - cd "$QT_PI_2" - git clone git://code.qt.io/qt/qtbase.git -b "$QT_BRANCH" - cd qtbase - ./configure \ - -release \ - -opengl es2 \ - -device linux-rasp-pi2-g++ \ - -device-option CROSS_COMPILE=/usr/bin/ \ - -opensource \ - -confirm-license \ - -make libs \ - -prefix /usr/local/qt5pi \ - -extprefix "$QT_PI_2/qt5pi" \ - -no-use-gold-linker +if [ ! -f "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi2.tar.gz" ]; then + echo "Building QT Base for Pi 2" + mkdir -p "$QT_PI_2" + cd "$QT_PI_2" + git clone git://code.qt.io/qt/qtbase.git -b "$QT_BRANCH" + cd qtbase + ./configure \ + -release \ + -opengl es2 \ + -device linux-rasp-pi2-g++ \ + -device-option CROSS_COMPILE=/usr/bin/ \ + -opensource \ + -confirm-license \ + -make libs \ + -prefix /usr/local/qt5pi \ + -extprefix "$QT_PI_2/qt5pi" \ + -no-use-gold-linker - make -j "$(nproc --all)" - make install - cp -r /usr/share/fonts/truetype/dejavu/ "$QT_PI_2/qt5pi/lib/fonts" - cd "$QT_PI_2" - tar -zcvf "$BUILD_TARGET/qtbase-pi2.tar.gz" qt5pi - cd "$BUILD_TARGET" - md5sum qtbase-pi2.tar.gz > qtbase-pi2.tar.gz.md5 - fi + make -j "$(nproc --all)" + make install + cp -r /usr/share/fonts/truetype/dejavu/ "$QT_PI_2/qt5pi/lib/fonts" + cd "$QT_PI_2" + tar -zcvf "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi2.tar.gz" qt5pi + cd "$BUILD_TARGET" + sha256sum "qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi2.tar.gz" > "qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi2.tar.gz.sha256" +fi - if [ ! -f "$BUILD_TARGET/qtbase-pi3.tar.gz" ]; then - echo "Building QT Base for Pi 3" - mkdir -p $QT_PI_3 - cd "$QT_PI_3" - git clone git://code.qt.io/qt/qtbase.git -b "$QT_BRANCH" - cd qtbase - ./configure \ - -release \ - -opengl es2 \ - -device linux-rasp-pi3-g++ \ - -device-option CROSS_COMPILE=/usr/bin/ \ - -opensource \ - -confirm-license \ - -release \ - -make libs \ - -prefix /usr/local/qt5pi \ - -extprefix "$QT_PI_3/qt5pi" \ - -no-use-gold-linker +if [ ! -f "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi3.tar.gz" ]; then + echo "Building QT Base for Pi 3" + mkdir -p $QT_PI_3 + cd "$QT_PI_3" + git clone git://code.qt.io/qt/qtbase.git -b "$QT_BRANCH" + cd qtbase + ./configure \ + -release \ + -opengl es2 \ + -device linux-rasp-pi3-g++ \ + -device-option CROSS_COMPILE=/usr/bin/ \ + -opensource \ + -confirm-license \ + -release \ + -make libs \ + -prefix /usr/local/qt5pi \ + -extprefix "$QT_PI_3/qt5pi" \ + -no-use-gold-linker - make -j "$(nproc --all)" - make install - cp -r /usr/share/fonts/truetype/dejavu/ "$QT_PI_3/qt5pi/lib/fonts" - cd "$QT_PI_3" - tar -zcvf "$BUILD_TARGET/qtbase-pi3.tar.gz" qt5pi - cd "$BUILD_TARGET" - md5sum qtbase-pi3.tar.gz > qtbase-pi3.tar.gz.md5 - fi + make -j "$(nproc --all)" + make install + cp -r /usr/share/fonts/truetype/dejavu/ "$QT_PI_3/qt5pi/lib/fonts" + cd "$QT_PI_3" + tar -zcvf "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi3.tar.gz" qt5pi + cd "$BUILD_TARGET" + sha256sum "qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi3.tar.gz" > "qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi3.tar.gz.sha256" fi From e50fb226a9f19538ec36b6e2ead734d5097c42da Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 18 Nov 2020 15:46:08 +0000 Subject: [PATCH 093/224] Restores viewer functionality and attempts to build containers. --- .github/workflows/ci.yaml.disabled | 42 ---------- .github/workflows/docker-build.yaml | 37 ++++++++ bin/build_containers.sh | 17 ++++ docker-compose.yml | 2 +- docker/Dockerfile.viewer | 63 ++++++++++---- docker/Dockerfile.viewer.bak | 125 ---------------------------- 6 files changed, 103 insertions(+), 183 deletions(-) delete mode 100644 .github/workflows/ci.yaml.disabled create mode 100644 .github/workflows/docker-build.yaml create mode 100644 bin/build_containers.sh delete mode 100644 docker/Dockerfile.viewer.bak diff --git a/.github/workflows/ci.yaml.disabled b/.github/workflows/ci.yaml.disabled deleted file mode 100644 index 3ca1c7edb..000000000 --- a/.github/workflows/ci.yaml.disabled +++ /dev/null @@ -1,42 +0,0 @@ -name: ci - -on: - push: -jobs: - buildx: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Set up Docker Buildx - id: buildx - uses: crazy-max/ghaction-docker-buildx@v3 - with: - buildx-version: latest - qemu-version: latest - - - name: Available platforms - run: echo ${{ steps.buildx.outputs.platforms }} - - - name: Run Buildx - run: | - docker buildx build \ - --platform linux/arm/v7 \ - --load \ - -t "screenly-ose-webview-builder" \ - --file Dockerfile . - - - name: Make artifacts folder - run: mkdir -p artifacts - - - name: Run webviewer build - run: | - docker run \ - -v $(pwd)/artifacts:/build \ - screenly-ose-webview-builder build.sh - - - uses: actions/upload-artifact@v2 - with: - name: build-artifacts - path: artifacts diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml new file mode 100644 index 000000000..89ade4937 --- /dev/null +++ b/.github/workflows/docker-build.yaml @@ -0,0 +1,37 @@ +name: ci + +on: + push: +jobs: + buildx: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Set up Docker Buildx + id: buildx + uses: crazy-max/ghaction-docker-buildx@v3 + with: + buildx-version: latest + qemu-version: latest + + - name: Available platforms + run: echo ${{ steps.buildx.outputs.platforms }} + + - name: Building websocket container + run: | + docker buildx build \ + --platform linux/arm/v6,linux/arm/v7 \ + -t "screenly/srly-ose-websocket" \ + -f docker/Dockerfile.websocket . + +# - name: Building viewer containers +# run: | +# for pi_version in pi1 pi2 pi3; do +# docker buildx build \ +# --platform linux/arm/v6,linux/arm/v7 \ +# --build-arg "PI_VERSION=$pi_version" \ +# -f docker/Dockerfile.viewer \ +# -t "screenly/srly-ose-viewer:$pi_version" . +# done diff --git a/bin/build_containers.sh b/bin/build_containers.sh new file mode 100644 index 000000000..52e849dd7 --- /dev/null +++ b/bin/build_containers.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# vim: tabstop=4 shiftwidth=4 softtabstop=4 +# -*- sh-basic-offset: 4 -*- + +set -euo pipefail + +docker-compose build + +echo "Building viewer for different architectures..." +for pi_version in pi1 pi2 pi3; do + docker build \ + --build-arg "PI_VERSION=$pi_version" \ + -f docker/Dockerfile.viewer \ + -t "srly-ose-viewer:$pi_version" . +done + diff --git a/docker-compose.yml b/docker-compose.yml index bc6292932..f2208531c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: srly-ose-viewer: build: context: . - dockerfile: docker/Dockerfile.viewer.bak + dockerfile: docker/Dockerfile.viewer depends_on: - srly-ose-server environment: diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index 748d40950..d5ad9b6e5 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -1,6 +1,5 @@ FROM balenalib/rpi-raspbian:buster as viewer-builder -RUN sed -i -e 's/#deb-src/deb-src/' /etc/apt/sources.list RUN apt-get update && \ apt-get -y install --no-install-recommends \ build-essential \ @@ -13,9 +12,18 @@ RUN apt-get update && \ libudev-dev \ libxcb-xinerama0 \ libxcb-xinerama0-dev \ + wget \ make && \ apt-get clean +RUN wget \ + "https://storage.googleapis.com/ose-lab/stretch/5.9/qtbase-pi3.tar.gz" \ + -q -O /tmp/qtbase.tar.gz + +RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local +RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf +RUN ldconfig + RUN mkdir /src WORKDIR /src COPY webview/ /src/ @@ -23,15 +31,17 @@ RUN /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake RUN make -j 4 RUN make install - -FROM balenalib/rpi-raspbian:buster +# We're stuck on Stretch as QT fails on later versions +FROM balenalib/rpi-raspbian:stretch RUN apt-get update && \ - apt-get -y install --no-install-recommends \ + apt-get -y install \ build-essential \ + curl \ git-core \ - gstreamer1.0-plugins-good \ + gstreamer0.10-plugins-good \ libdbus-glib-1-dev \ + wget \ libffi-dev \ libqt5webkit5 \ libraspberrypi0 \ @@ -40,7 +50,6 @@ RUN apt-get update && \ net-tools \ omxplayer \ psmisc \ - ca-certificates \ python-dev \ python-gobject \ python-netifaces \ @@ -50,21 +59,45 @@ RUN apt-get update && \ apt-get clean # Install Python requirements -ADD requirements/requirements.viewer.txt /tmp/requirements.viewer.txt -RUN pip install --no-cache-dir -r /tmp/requirements.viewer.txt +ADD requirements/requirements.viewer.txt /tmp/requirements.txt +RUN pip install --no-cache-dir -r /tmp/requirements.txt + +# QT Base from packages does not support eglfs +ARG PI_VERSION=pi3 +ARG DEBIAN_VERSION=stretch +ARG QT_VERSION=5.9 +RUN wget \ + "https://storage.googleapis.com/ose-lab/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz" \ + -q -O /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz +RUN wget \ + "https://storage.googleapis.com/ose-lab/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256" \ + -q -O /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 +RUN cd /tmp && \ + sha246sum -c qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 -# Environment variables -ENV UDEV=1 -ENV QT_QPA_PLATFORM eglfs -ENV QT_QPA_EGLFS_FORCE888=1 -ENV NOREFRESH 1 # Fix white flickering in omxplayer +RUN tar -xzf /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz -C /usr/local +RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf +RUN ldconfig + +# Fix symlinks +RUN rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1 +RUN rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1 +RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 + +RUN rm -f /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 +RUN rm -f /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 +RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 RUN mkdir -p /usr/local/share/ScreenlyWebview COPY --from=viewer-builder /src/ScreenlyWebview /usr/local/bin/ COPY --from=viewer-builder /src/res /usr/local/share/ScreenlyWebview/ +WORKDIR /usr/src/app RUN mkdir -p /usr/src/app COPY . /usr/src/app/ -WORKDIR /usr/src/app -CMD ["bash", "bin/start_viewer.sh"] +CMD ["bash", "./bin/start_viewer.sh"] diff --git a/docker/Dockerfile.viewer.bak b/docker/Dockerfile.viewer.bak deleted file mode 100644 index 8bd041366..000000000 --- a/docker/Dockerfile.viewer.bak +++ /dev/null @@ -1,125 +0,0 @@ -FROM balenalib/rpi-raspbian:buster as viewer-builder - -RUN apt-get update && \ - apt-get -y install --no-install-recommends \ - build-essential \ - g++ \ - libinput-dev \ - libqt5gui5 \ - libqt5webkit5-dev \ - libqt5x11extras5-dev \ - libts-dev \ - libudev-dev \ - libxcb-xinerama0 \ - libxcb-xinerama0-dev \ - wget \ - make && \ - apt-get clean - -RUN wget \ - "https://storage.googleapis.com/ose-lab/stretch/5.9/qtbase-pi3.tar.gz" \ - -q -O /tmp/qtbase.tar.gz - -RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local -RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf -RUN ldconfig - -RUN mkdir /src -WORKDIR /src -COPY webview/ /src/ -#RUN /usr/local/qt5pi/bin/qmake -RUN /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake -RUN make -j 4 -RUN make install - -#FROM balenalib/rpi-raspbian:buster -# -#RUN apt-get update && \ -# apt-get -y install \ -# build-essential \ -# curl \ -# git-core \ -# gstreamer1.0-plugins-good \ -# libdbus-glib-1-dev \ -# libffi-dev \ -# libqt5webkit5 \ -# libraspberrypi0 \ -# libssl-dev \ -# libts-dev \ -# net-tools \ -# omxplayer \ -# psmisc \ -# python-dev \ -# python-gobject \ -# python-netifaces \ -# python-pip \ -# python-setuptools \ -# wget \ -# sqlite3 && \ -# apt-get clean - -FROM balenalib/rpi-raspbian:stretch - -RUN apt-get update && \ - apt-get -y install \ - build-essential \ - curl \ - git-core \ - gstreamer0.10-plugins-good \ - libdbus-glib-1-dev \ - wget \ - libffi-dev \ - libqt5webkit5 \ - libraspberrypi0 \ - libssl-dev \ - libts-dev \ - net-tools \ - omxplayer \ - psmisc \ - python-dev \ - python-gobject \ - python-netifaces \ - python-pip \ - python-setuptools \ - sqlite3 && \ - apt-get clean - -# Install Python requirements -ADD requirements/requirements.viewer.txt /tmp/requirements.txt -RUN pip install --no-cache-dir -r /tmp/requirements.txt - -# QtBase from packages does not support eglfs -ARG PI_VERSION=pi3 -#RUN wget \ -# "https://github.com/Screenly/screenly-ose-webview/releases/download/v0.1/qtbase-$PI_VERSION.tar.gz" \ -# -q-O /tmp/qtbase.tar.gz -RUN wget \ - "https://storage.googleapis.com/ose-lab/stretch/5.9/qtbase-pi3.tar.gz" \ - -q -O /tmp/qtbase.tar.gz - -RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local -RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf -RUN ldconfig - -# Fix symlinks -RUN rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1 -RUN rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 -RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so -RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1 -RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 - -RUN rm -f /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 -RUN rm -f /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 -RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so -RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 -RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 - -RUN mkdir -p /usr/local/share/ScreenlyWebview -COPY --from=viewer-builder /src/ScreenlyWebview /usr/local/bin/ -COPY --from=viewer-builder /src/res /usr/local/share/ScreenlyWebview/ - -WORKDIR /usr/src/app -RUN mkdir -p /usr/src/app -COPY . /usr/src/app/ - -CMD ["bash", "./bin/start_viewer.sh"] From 1ab5b78c9a2deb8fe46e44b5e2dab08d903a9acd Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 18 Nov 2020 17:17:43 +0000 Subject: [PATCH 094/224] Build tweaks --- .github/workflows/docker-build.yaml | 6 ++++++ bin/build_containers.sh | 23 ++++++++++++++++++++--- docker/Dockerfile.viewer | 2 +- 3 files changed, 27 insertions(+), 4 deletions(-) mode change 100644 => 100755 bin/build_containers.sh diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index 89ade4937..e54535175 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -2,6 +2,12 @@ name: ci on: push: + branches: + - master + - production + - experimental + - experimental-fixes + jobs: buildx: runs-on: ubuntu-latest diff --git a/bin/build_containers.sh b/bin/build_containers.sh old mode 100644 new mode 100755 index 52e849dd7..0ac6b669d --- a/bin/build_containers.sh +++ b/bin/build_containers.sh @@ -5,13 +5,30 @@ set -euo pipefail -docker-compose build +#GITBRANCH=$(git rev-parse --abbrev-ref HEAD) +GITBRANCH='latest' + +if [ -n "$CROSS_COMPILE" ]; then + echo "Running with cross-compile using docker buildx..." + DOCKER_BUILD_ARGS=("buildx" "build" "--push" "--platform" "linux/arm/v6,linux/arm/v7") +else + echo "Running without cross-compile..." + DOCKER_BUILD_ARGS=("build") +fi + + +for container in server celery redis websocket; do + echo "Building $container" + docker "${DOCKER_BUILD_ARGS[@]}" \ + -f "docker/Dockerfile.$container" \ + -t "srly-ose-$container:$GITBRANCH" . +done echo "Building viewer for different architectures..." for pi_version in pi1 pi2 pi3; do - docker build \ + docker "${DOCKER_BUILD_ARGS[@]}" \ --build-arg "PI_VERSION=$pi_version" \ -f docker/Dockerfile.viewer \ - -t "srly-ose-viewer:$pi_version" . + -t "srly-ose-viewer:$GITBRANCH-$pi_version" . done diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index d5ad9b6e5..f1bc3e05e 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -31,7 +31,7 @@ RUN /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake RUN make -j 4 RUN make install -# We're stuck on Stretch as QT fails on later versions +# @TODO: Upgrade to Buster. We're stuck on QT 5.9 and Stretch for now. FROM balenalib/rpi-raspbian:stretch RUN apt-get update && \ From e8e96d77dbaff242b073dea6193fdebd8318b1fb Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 18 Nov 2020 17:19:32 +0000 Subject: [PATCH 095/224] Fixes unbound variable issue --- bin/build_containers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build_containers.sh b/bin/build_containers.sh index 0ac6b669d..301abcfa3 100755 --- a/bin/build_containers.sh +++ b/bin/build_containers.sh @@ -8,7 +8,7 @@ set -euo pipefail #GITBRANCH=$(git rev-parse --abbrev-ref HEAD) GITBRANCH='latest' -if [ -n "$CROSS_COMPILE" ]; then +if [ -n "${CROSS_COMPILE+x}" ]; then echo "Running with cross-compile using docker buildx..." DOCKER_BUILD_ARGS=("buildx" "build" "--push" "--platform" "linux/arm/v6,linux/arm/v7") else From c5addb370769f8ff3364ba9fa209181064033e49 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 18 Nov 2020 17:28:38 +0000 Subject: [PATCH 096/224] Fixes typo --- docker/Dockerfile.viewer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index f1bc3e05e..01bcbc49f 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -73,7 +73,7 @@ RUN wget \ "https://storage.googleapis.com/ose-lab/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256" \ -q -O /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 RUN cd /tmp && \ - sha246sum -c qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 + sha256sum -c qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 RUN tar -xzf /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz -C /usr/local RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf From 517e3dd5d71a10e5c9c130ffde0d41ce984df078 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 18 Nov 2020 17:37:42 +0000 Subject: [PATCH 097/224] Space optimization in viewer build --- docker/Dockerfile.viewer | 43 +++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index 01bcbc49f..1134695ce 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -66,31 +66,28 @@ RUN pip install --no-cache-dir -r /tmp/requirements.txt ARG PI_VERSION=pi3 ARG DEBIAN_VERSION=stretch ARG QT_VERSION=5.9 -RUN wget \ - "https://storage.googleapis.com/ose-lab/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz" \ - -q -O /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz -RUN wget \ - "https://storage.googleapis.com/ose-lab/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256" \ - -q -O /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 -RUN cd /tmp && \ - sha256sum -c qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 - -RUN tar -xzf /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz -C /usr/local -RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf -RUN ldconfig +RUN wget "https://storage.googleapis.com/ose-lab/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz" \ + -q -O /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz && \ + wget "https://storage.googleapis.com/ose-lab/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256" \ + -q -O /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 && \ + cd /tmp && \ + sha256sum -c qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 && \ + tar -xzf /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz -C /usr/local && \ + echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf && \ + ldconfig && \ + rm qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz* # Fix symlinks -RUN rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1 -RUN rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 -RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so -RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1 -RUN ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 - -RUN rm -f /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 -RUN rm -f /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 -RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so -RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 -RUN ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 +RUN rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1 && \ + rm -f /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 && \ + ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so && \ + ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1 && \ + ln -s /opt/vc/lib/libbrcmEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 && \ + rm -f /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 && \ + rm -f /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 && \ + ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so && \ + ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 && \ + ln -s /opt/vc/lib/libbrcmGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0 RUN mkdir -p /usr/local/share/ScreenlyWebview COPY --from=viewer-builder /src/ScreenlyWebview /usr/local/bin/ From 42a17ed2a21c9de0aafe7de7d200d708ae72e48b Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 19 Nov 2020 10:00:45 +0000 Subject: [PATCH 098/224] More build optimizations --- bin/build_containers.sh | 4 ++-- docker/Dockerfile.viewer | 21 ++++++++++++++------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/bin/build_containers.sh b/bin/build_containers.sh index 301abcfa3..293531794 100755 --- a/bin/build_containers.sh +++ b/bin/build_containers.sh @@ -21,7 +21,7 @@ for container in server celery redis websocket; do echo "Building $container" docker "${DOCKER_BUILD_ARGS[@]}" \ -f "docker/Dockerfile.$container" \ - -t "srly-ose-$container:$GITBRANCH" . + -t "screenly/srly-ose-$container:$GITBRANCH" . done echo "Building viewer for different architectures..." @@ -29,6 +29,6 @@ for pi_version in pi1 pi2 pi3; do docker "${DOCKER_BUILD_ARGS[@]}" \ --build-arg "PI_VERSION=$pi_version" \ -f docker/Dockerfile.viewer \ - -t "srly-ose-viewer:$GITBRANCH-$pi_version" . + -t "screenly/srly-ose-viewer:$GITBRANCH-$pi_version" . done diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index 1134695ce..d1bb85059 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -16,13 +16,20 @@ RUN apt-get update && \ make && \ apt-get clean -RUN wget \ - "https://storage.googleapis.com/ose-lab/stretch/5.9/qtbase-pi3.tar.gz" \ - -q -O /tmp/qtbase.tar.gz - -RUN tar -xzf /tmp/qtbase.tar.gz -C /usr/local -RUN echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf -RUN ldconfig +# QT Base from packages does not support eglfs +ARG PI_VERSION=pi3 +ARG DEBIAN_VERSION=stretch +ARG QT_VERSION=5.9 +RUN wget "https://storage.googleapis.com/ose-lab/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz" \ + -q -O /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz && \ + wget "https://storage.googleapis.com/ose-lab/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256" \ + -q -O /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 && \ + cd /tmp && \ + sha256sum -c qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 && \ + tar -xzf /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz -C /usr/local && \ + echo "/usr/local/qt5pi/lib" > /etc/ld.so.conf.d/00-qt5pi.conf && \ + ldconfig && \ + rm qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz* RUN mkdir /src WORKDIR /src From a35e58ec73270201219938902c5b94009736e76c Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 19 Nov 2020 10:26:11 +0000 Subject: [PATCH 099/224] Fixes build pushes --- bin/build_containers.sh | 11 +++++++++++ docker-compose.yml | 20 +++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/bin/build_containers.sh b/bin/build_containers.sh index 293531794..ca3e1e7e7 100755 --- a/bin/build_containers.sh +++ b/bin/build_containers.sh @@ -22,13 +22,24 @@ for container in server celery redis websocket; do docker "${DOCKER_BUILD_ARGS[@]}" \ -f "docker/Dockerfile.$container" \ -t "screenly/srly-ose-$container:$GITBRANCH" . + + # Push if the push flag is set and not cross compiling + if [[ ( -n "${PUSH+x}" && -z "${CROSS_COMPILE+x}" ) ]]; then + docker push "screenly/srly-ose-$container:$GITBRANCH" . + fi done echo "Building viewer for different architectures..." for pi_version in pi1 pi2 pi3; do + echo "Building viewer container for $pi_version" docker "${DOCKER_BUILD_ARGS[@]}" \ --build-arg "PI_VERSION=$pi_version" \ -f docker/Dockerfile.viewer \ -t "screenly/srly-ose-viewer:$GITBRANCH-$pi_version" . + + # Push if the push flag is set and not cross compiling + if [[ ( -n "${PUSH+x}" && -z "${CROSS_COMPILE+x}" ) ]]; then + docker push -t "screenly/srly-ose-viewer:$GITBRANCH-$pi_version" + fi done diff --git a/docker-compose.yml b/docker-compose.yml index f2208531c..c4f848c92 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,7 @@ version: "2" services: srly-ose-server: - build: - context: . - dockerfile: docker/Dockerfile.server + image: screenly/srly-ose-server:latest environment: - HOME=/data - LISTEN=0.0.0.0 @@ -16,9 +14,7 @@ services: volumes: - resin-data:/data srly-ose-viewer: - build: - context: . - dockerfile: docker/Dockerfile.viewer + image: screenly/srly-ose-viewer-pi3:latest depends_on: - srly-ose-server environment: @@ -31,9 +27,7 @@ services: volumes: - resin-data:/data srly-ose-websocket: - build: - context: . - dockerfile: docker/Dockerfile.websocket + image: screenly/srly-ose-websocket:latest depends_on: - srly-ose-server environment: @@ -46,9 +40,7 @@ services: volumes: - resin-data:/data srly-ose-celery: - build: - context: . - dockerfile: docker/Dockerfile.celery + image: screenly/srly-ose-celery:latest depends_on: - srly-ose-server - redis @@ -61,9 +53,7 @@ services: volumes: - resin-data:/data redis: - build: - context: . - dockerfile: docker/Dockerfile.redis + image: screenly/srly-ose-redis:latest restart: always volumes: From beaf59958e704f547e62a0f96dbbab57a65b323a Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 19 Nov 2020 10:27:42 +0000 Subject: [PATCH 100/224] Fixes syntax --- bin/build_containers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/build_containers.sh b/bin/build_containers.sh index ca3e1e7e7..18f0592cb 100755 --- a/bin/build_containers.sh +++ b/bin/build_containers.sh @@ -25,7 +25,7 @@ for container in server celery redis websocket; do # Push if the push flag is set and not cross compiling if [[ ( -n "${PUSH+x}" && -z "${CROSS_COMPILE+x}" ) ]]; then - docker push "screenly/srly-ose-$container:$GITBRANCH" . + docker push "screenly/srly-ose-$container:$GITBRANCH" fi done @@ -39,7 +39,7 @@ for pi_version in pi1 pi2 pi3; do # Push if the push flag is set and not cross compiling if [[ ( -n "${PUSH+x}" && -z "${CROSS_COMPILE+x}" ) ]]; then - docker push -t "screenly/srly-ose-viewer:$GITBRANCH-$pi_version" + docker push "screenly/srly-ose-viewer:$GITBRANCH-$pi_version" fi done From 705e4495d74a71f1cb70369ca613809b18e6c11d Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 19 Nov 2020 10:47:10 +0000 Subject: [PATCH 101/224] Minor tweak --- bin/build_containers.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/build_containers.sh b/bin/build_containers.sh index 18f0592cb..1d3e8ccb3 100755 --- a/bin/build_containers.sh +++ b/bin/build_containers.sh @@ -16,7 +16,6 @@ else DOCKER_BUILD_ARGS=("build") fi - for container in server celery redis websocket; do echo "Building $container" docker "${DOCKER_BUILD_ARGS[@]}" \ From 6f0198d4c393dec425f646d371ffdfd9df073088 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 19 Nov 2020 10:51:50 +0000 Subject: [PATCH 102/224] Fixes syntax in docker-compose --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index c4f848c92..a89cc16e5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: volumes: - resin-data:/data srly-ose-viewer: - image: screenly/srly-ose-viewer-pi3:latest + image: screenly/srly-ose-viewer:latest-pi3 depends_on: - srly-ose-server environment: From 75fb10e7a6e32f043d9377c833a61dc6c5df6aed Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 19 Nov 2020 14:18:40 +0000 Subject: [PATCH 103/224] Minor refactoring of images. --- ansible/roles/nginx/tasks/main.yml | 49 ++++++++++++------------- ansible/roles/rpi-update/tasks/main.yml | 24 ------------ ansible/roles/system/tasks/main.yml | 21 ----------- ansible/site.yml | 1 - bin/build_containers.sh | 2 +- docker-compose.yml | 9 +++++ docker/Dockerfile.base | 27 ++++++++++++++ docker/Dockerfile.celery | 23 +----------- docker/Dockerfile.server | 25 +------------ docker/Dockerfile.websocket | 12 +----- 10 files changed, 64 insertions(+), 129 deletions(-) delete mode 100644 ansible/roles/rpi-update/tasks/main.yml create mode 100644 docker/Dockerfile.base diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml index 18e610a30..7cb3b3acf 100644 --- a/ansible/roles/nginx/tasks/main.yml +++ b/ansible/roles/nginx/tasks/main.yml @@ -1,26 +1,25 @@ --- -# Enable Nginx -- name: Check screenly.conf - command: cat /home/pi/.screenly/screenly.conf - register: config - -- set_fact: no_ssl="{{config.stdout.find('use_ssl = True') == -1}}" - -- name: Installs Nginx - apt: - name: nginx-light - state: present - update_cache: yes - -- name: Cleans up default config - file: - path: /etc/nginx/sites-enabled/default - state: absent - -- name: Installs nginx config - copy: - src: nginx.conf - dest: /etc/nginx/sites-enabled/screenly.conf - mode: 644 - owner: root - group: root +#- name: Check screenly.conf +# command: cat /home/pi/.screenly/screenly.conf +# register: config +# +#- set_fact: no_ssl="{{config.stdout.find('use_ssl = True') == -1}}" +# +#- name: Installs Nginx +# apt: +# name: nginx-light +# state: present +# update_cache: yes +# +#- name: Cleans up default config +# file: +# path: /etc/nginx/sites-enabled/default +# state: absent +# +#- name: Installs nginx config +# copy: +# src: nginx.conf +# dest: /etc/nginx/sites-enabled/screenly.conf +# mode: 644 +# owner: root +# group: root diff --git a/ansible/roles/rpi-update/tasks/main.yml b/ansible/roles/rpi-update/tasks/main.yml deleted file mode 100644 index b8092e0cb..000000000 --- a/ansible/roles/rpi-update/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- - -- name: Download rpi-update - get_url: - url: https://raw.githubusercontent.com/Hexxeh/rpi-update/master/rpi-update - dest: /usr/bin/rpi-update - mode: 0755 - owner: root - group: root - when: ansible_distribution_release == "wheezy" - -- name: Run kernel upgrade (this can take up to 10 minutes) - command: /usr/bin/rpi-update - when: ansible_distribution_release == "wheezy" - environment: - SKIP_WARNING: 1 - register: rpiupdate - tags: - - system-upgrade - -- debug: msg="{{ rpiupdate.stdout }}" - when: ansible_distribution_release == "wheezy" - tags: - - system-upgrade diff --git a/ansible/roles/system/tasks/main.yml b/ansible/roles/system/tasks/main.yml index d40eb06db..cb01432fd 100644 --- a/ansible/roles/system/tasks/main.yml +++ b/ansible/roles/system/tasks/main.yml @@ -169,17 +169,7 @@ - name: Install Screenly dependencies apt: name: - - console-data - - libffi-dev - - libssl-dev - - omxplayer - - python-dev - - python-gobject - - python-netifaces - - python-simplejson - rpi-update - - sqlite3 - - systemd state: latest - name: Remove deprecated apt dependencies @@ -198,17 +188,6 @@ - xserver-xorg state: absent -- name: Remove cups/printing related packages - apt: - name: - - cups - - cups-browsed - - cups-client - - cups-common - - cups-daemon - - cups-server-common - state: absent - - name: Add docker apt key apt_key: url: https://download.docker.com/linux/raspbian/gpg diff --git a/ansible/site.yml b/ansible/site.yml index 133eb4e3d..f0625ca9b 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -15,7 +15,6 @@ roles: - system - - rpi-update - screenly - network - splashscreen diff --git a/bin/build_containers.sh b/bin/build_containers.sh index 1d3e8ccb3..f47358909 100755 --- a/bin/build_containers.sh +++ b/bin/build_containers.sh @@ -16,7 +16,7 @@ else DOCKER_BUILD_ARGS=("build") fi -for container in server celery redis websocket; do +for container in base server celery redis websocket; do echo "Building $container" docker "${DOCKER_BUILD_ARGS[@]}" \ -f "docker/Dockerfile.$container" \ diff --git a/docker-compose.yml b/docker-compose.yml index a89cc16e5..c68614b43 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,9 @@ services: restart: always volumes: - resin-data:/data + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + srly-ose-viewer: image: screenly/srly-ose-viewer:latest-pi3 depends_on: @@ -26,6 +29,8 @@ services: restart: always volumes: - resin-data:/data + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro srly-ose-websocket: image: screenly/srly-ose-websocket:latest depends_on: @@ -39,6 +44,8 @@ services: restart: always volumes: - resin-data:/data + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro srly-ose-celery: image: screenly/srly-ose-celery:latest depends_on: @@ -52,6 +59,8 @@ services: restart: always volumes: - resin-data:/data + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro redis: image: screenly/srly-ose-redis:latest restart: always diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base new file mode 100644 index 000000000..c89b7563a --- /dev/null +++ b/docker/Dockerfile.base @@ -0,0 +1,27 @@ +FROM balenalib/rpi-raspbian:buster + +RUN apt-get update && \ + apt-get -y install --no-install-recommends \ + build-essential \ + curl \ + ffmpeg \ + git \ + git-core \ + ifupdown \ + libffi-dev \ + libraspberrypi0 \ + libssl-dev \ + lsb-release \ + mplayer \ + net-tools \ + omxplayer \ + procps \ + psmisc \ + python-dev \ + python-gobject \ + python-pil \ + python-pip \ + python-setuptools \ + python-simplejson \ + sqlite3 && \ + apt-get clean diff --git a/docker/Dockerfile.celery b/docker/Dockerfile.celery index dffe076fe..cd1302e13 100644 --- a/docker/Dockerfile.celery +++ b/docker/Dockerfile.celery @@ -1,25 +1,4 @@ -FROM balenalib/rpi-raspbian:buster - -RUN apt-get update && \ - apt-get -y install --no-install-recommends \ - build-essential \ - curl \ - git-core \ - libffi-dev \ - libssl-dev \ - net-tools \ - omxplayer \ - psmisc \ - python-dev \ - python-gobject \ - python-pip \ - python-setuptools \ - python-pil \ - python-simplejson \ - libraspberrypi0 \ - ifupdown \ - sqlite3 && \ - apt-get clean +FROM srly-ose-base ADD requirements/requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt diff --git a/docker/Dockerfile.server b/docker/Dockerfile.server index f98b649a8..c672ee78c 100644 --- a/docker/Dockerfile.server +++ b/docker/Dockerfile.server @@ -1,27 +1,4 @@ -FROM balenalib/rpi-raspbian:buster - -RUN apt-get update && \ - apt-get -y install --no-install-recommends \ - build-essential \ - curl \ - ffmpeg \ - git \ - libffi-dev \ - libssl-dev \ - lsb-release \ - mplayer \ - net-tools \ - procps \ - python-pip \ - python-setuptools \ - python-dev \ - omxplayer \ - python-gobject \ - python-pil \ - python-simplejson \ - sqlite3 \ - && \ - apt-get clean +FROM srly-ose-base ADD requirements/requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt diff --git a/docker/Dockerfile.websocket b/docker/Dockerfile.websocket index 2dd479de3..757bf3835 100644 --- a/docker/Dockerfile.websocket +++ b/docker/Dockerfile.websocket @@ -1,14 +1,4 @@ -FROM balenalib/rpi-raspbian:buster - -RUN apt-get update && \ - apt-get -y install --no-install-recommends \ - build-essential \ - curl \ - libffi-dev \ - python-setuptools \ - python-pip \ - python-dev && \ - apt-get clean +FROM srly-ose-base ADD requirements/requirements-websocket.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt From d3c5087c81b7d6ccec1da0898402ae466bce653f Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 19 Nov 2020 14:19:40 +0000 Subject: [PATCH 104/224] Fixes reference. --- docker/Dockerfile.celery | 2 +- docker/Dockerfile.server | 2 +- docker/Dockerfile.websocket | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.celery b/docker/Dockerfile.celery index cd1302e13..7cb1c7477 100644 --- a/docker/Dockerfile.celery +++ b/docker/Dockerfile.celery @@ -1,4 +1,4 @@ -FROM srly-ose-base +FROM screenly/srly-ose-base ADD requirements/requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt diff --git a/docker/Dockerfile.server b/docker/Dockerfile.server index c672ee78c..292661919 100644 --- a/docker/Dockerfile.server +++ b/docker/Dockerfile.server @@ -1,4 +1,4 @@ -FROM srly-ose-base +FROM screenly/srly-ose-base ADD requirements/requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt diff --git a/docker/Dockerfile.websocket b/docker/Dockerfile.websocket index 757bf3835..b4241d959 100644 --- a/docker/Dockerfile.websocket +++ b/docker/Dockerfile.websocket @@ -1,4 +1,4 @@ -FROM srly-ose-base +FROM screenly/srly-ose-base ADD requirements/requirements-websocket.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt From d1c8d2ca771b0b54820b7c7372e374fde8a97675 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 19 Nov 2020 17:44:39 +0000 Subject: [PATCH 105/224] More cleanup and fixes to setup --- ansible/roles/screenly/tasks/main.yml | 91 --------------------------- bin/install.sh | 70 ++++++++++++++++----- docker-compose.override.yml | 72 +++++++++++++++++++++ docker/Dockerfile.celery | 1 - 4 files changed, 127 insertions(+), 107 deletions(-) create mode 100644 docker-compose.override.yml diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index c2988c7d2..20dc5dba4 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -157,94 +157,3 @@ - debug: msg: "Use {{ docker_tag }} version of images." -- name: Run docker-compose - docker_compose: - project_name: screenly - debug: yes - pull: no - build: yes - definition: - version: "2" - services: - screenly-ose-server: - image: "screenly/screenly-ose-server:{{ docker_tag }}" - build: - context: /home/pi/screenly - dockerfile: /home/pi/screenly/docker/Dockerfile.server - container_name: screenly-server - entrypoint: python server.py - restart: unless-stopped - network_mode: "host" - volumes: - - /home/pi/screenly_assets:/home/pi/screenly_assets - - /home/pi/screenly:/home/pi/screenly - - /home/pi/.screenly:/home/pi/.screenly - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - - screenly-ose-viewer: - image: "screenly/screenly-ose-viewer:{{ docker_tag }}-{{ device_type }}" - build: - context: /home/pi/screenly - dockerfile: /home/pi/screenly/docker/Dockerfile.viewer - args: - - PI_VERSION={{ device_type }} - container_name: screenly-viewer - privileged: true - restart: unless-stopped - network_mode: "host" - volumes: - - /home/pi/screenly_assets:/home/pi/screenly_assets - - /home/pi/screenly:/home/pi/screenly - - /home/pi/.screenly:/home/pi/.screenly - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - depends_on: - - screenly-ose-server - - screenly-ose-websocket: - image: "screenly/screenly-ose-websocket:{{ docker_tag }}" - build: - context: /home/pi/screenly - dockerfile: /home/pi/screenly/docker/Dockerfile.websocket - container_name: screenly-ose-websocket - restart: unless-stopped - network_mode: "host" - volumes: - - /home/pi/screenly_assets:/home/pi/screenly_assets - - /home/pi/screenly:/home/pi/screenly - - /home/pi/.screenly:/home/pi/.screenly - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - depends_on: - - screenly-ose-server - - screenly-ose-celery: - image: "screenly/screenly-ose-celery:{{ docker_tag }}" - build: - context: /home/pi/screenly - dockerfile: /home/pi/screenly/docker/Dockerfile.server - container_name: screenly-celery - entrypoint: celery worker -A server.celery -B -n worker@screenly --loglevel=info --schedule /tmp/celerybeat-schedule - network_mode: "host" - restart: unless-stopped - volumes: - - /home/pi/screenly_assets:/home/pi/screenly_assets - - /home/pi/screenly:/home/pi/screenly - - /home/pi/.screenly:/home/pi/.screenly - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - depends_on: - - screenly-ose-server - - redis - - redis: - image: redis:alpine - restart: unless-stopped - ports: - - "6379:6379" - - recreate: smart - -- name: Pause screenly-viewer container - command: docker pause screenly-viewer diff --git a/bin/install.sh b/bin/install.sh index 09d8858c1..5b10e8e83 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -36,7 +36,7 @@ if [ "$WEB_UPGRADE" = false ]; then # clear screen clear; - + # Set color of logo tput setaf 6 tput bold @@ -112,9 +112,9 @@ elif [ "$WEB_UPGRADE" = true ]; then fi if [ "$UPGRADE_SYSTEM" = false ]; then - EXTRA_ARGS="--skip-tags enable-ssl,system-upgrade" + EXTRA_ARGS=("--skip-tags" "enable-ssl,system-upgrade") elif [ "$UPGRADE_SYSTEM" = true ]; then - EXTRA_ARGS="--skip-tags enable-ssl" + EXTRA_ARGS=("--skip-tags" "enable-ssl") else echo -e "Invalid -s parameter." exit 1 @@ -149,9 +149,9 @@ sudo mkdir -p /etc/ansible echo -e "[local]\nlocalhost ansible_connection=local" | sudo tee /etc/ansible/hosts > /dev/null if [ ! -f /etc/locale.gen ]; then - # No locales found. Creating locales with default UK/US setup. - echo -e "en_GB.UTF-8 UTF-8\nen_US.UTF-8 UTF-8" | sudo tee /etc/locale.gen > /dev/null - sudo locale-gen + # No locales found. Creating locales with default UK/US setup. + echo -e "en_GB.UTF-8 UTF-8\nen_US.UTF-8 UTF-8" | sudo tee /etc/locale.gen > /dev/null + sudo locale-gen fi sudo sed -i 's/apt.screenlyapp.com/archive.raspbian.org/g' /etc/apt/sources.list @@ -162,7 +162,7 @@ curl -s https://bootstrap.pypa.io/get-pip.py | sudo python # users who chose experimental and then reverted back to master or production need docker removed if [ "$BRANCH" != "experimental" ]; then - sudo apt-get purge -y docker-ce docker-ce-cli containerd.io > /dev/null + sudo apt-get purge -y docker-ce docker-ce-cli containerd.io > /dev/null fi if [ "$NETWORK" == 'y' ]; then @@ -174,19 +174,59 @@ fi sudo pip install ansible==2.8.8 -sudo -u pi ansible localhost -m git -a "repo=$REPOSITORY dest=/home/pi/screenly version=$BRANCH force=yes" +sudo -u pi ansible localhost \ + -m git \ + -a "repo=$REPOSITORY dest=/home/pi/screenly version=$BRANCH force=yes" cd /home/pi/screenly/ansible -sudo -E ansible-playbook site.yml $EXTRA_ARGS +sudo -E ansible-playbook site.yml "${EXTRA_ARGS[@]}" + +sudo docker-compose \ + -f /home/pi/screenly/docker-compose.yml \ + pull + +sudo docker-compose \ + -f /home/pi/screenly/docker-compose.yml \ + -f /home/pi/screenly/docker-compose.override.yml \ + up -d sudo apt-get autoclean sudo apt-get clean sudo apt autoremove -y -sudo find /usr/share/doc -depth -type f ! -name copyright -delete -sudo find /usr/share/doc -empty -delete -sudo rm -rf /usr/share/man /usr/share/groff /usr/share/info/* /usr/share/lintian /usr/share/linda /var/cache/man -sudo find /usr/share/locale -type f ! -name 'en' ! -name 'de*' ! -name 'es*' ! -name 'ja*' ! -name 'fr*' ! -name 'zh*' -delete -sudo find /usr/share/locale -mindepth 1 -maxdepth 1 ! -name 'en*' ! -name 'de*' ! -name 'es*' ! -name 'ja*' ! -name 'fr*' ! -name 'zh*' ! -name 'locale.alias' -exec rm -r {} \; +sudo find /usr/share/doc \ + -depth \ + -type f \ + ! -name copyright \ + -delete +sudo find /usr/share/doc \ + -empty \ + -delete +sudo rm -rf \ + /usr/share/man \ + /usr/share/groff \ + /usr/share/info/* \ + /usr/share/lintian \ + /usr/share/linda /var/cache/man +sudo find /usr/share/locale \ + -type f \ + ! -name 'en' \ + ! -name 'de*' \ + ! -name 'es*' \ + ! -name 'ja*' \ + ! -name 'fr*' \ + ! -name 'zh*' \ + -delete +sudo find /usr/share/locale \ + -mindepth 1 \ + -maxdepth 1 \ + ! -name 'en*' \ + ! -name 'de*' \ + ! -name 'es*' \ + ! -name 'ja*' \ + ! -name 'fr*' \ + ! -name 'zh*' \ + ! -name 'locale.alias' \ + -exec rm -r {} \; cd /home/pi/screenly && git rev-parse HEAD > /home/pi/.screenly/latest_screenly_sha sudo chown -R pi:pi /home/pi @@ -216,7 +256,7 @@ _CURRENTPIUSERPWD=$(sudo cat /etc/shadow | grep pi | awk -F ':' '{print $2}') _DEFAULTPIPWD=$(mkpasswd -m sha-512 raspberry $_CURRENTPISALT) if [[ "$_CURRENTPIUSERPWD" == "$_DEFAULTPIPWD" ]]; then - echo "(Warning): The default raspberry pi password was detected! - please change it now..." + echo "(Warning): The default Raspberry Pi password was detected! - please change it now..." set +e passwd set -e diff --git a/docker-compose.override.yml b/docker-compose.override.yml new file mode 100644 index 000000000..863e79d56 --- /dev/null +++ b/docker-compose.override.yml @@ -0,0 +1,72 @@ +version: "2" +services: + srly-ose-server: + image: screenly/srly-ose-server:${DOCKER_TAG} + environment: + - HOME=/data + - LISTEN=0.0.0.0 + - CELERY_BROKER_URL=redis://redis:6379/0 + - CELERY_RESULT_BACKEND=redis://redis:6379/0 + ports: + - 80:8080 + privileged: true + restart: always + volumes: + - /home/pi/.screenly:/data/.screenly + - /home/pi/screenly_assets:/data/screenly_assets + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + + srly-ose-viewer: + image: screenly/srly-ose-viewer:${DOCKER_TAG}-${DEVICE_TYPE} + depends_on: + - srly-ose-server + environment: + - HOME=/data + - NOREFRESH=1 + - PORT=80 + network_mode: "host" + privileged: true + restart: always + volumes: + - /home/pi/.screenly:/data/.screenly + - /home/pi/screenly_assets:/data/screenly_assets + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + srly-ose-websocket: + image: screenly/srly-ose-websocket:${DOCKER_TAG} + depends_on: + - srly-ose-server + environment: + - HOME=/data + - LISTEN=0.0.0.0 + ports: + - 9999:9999 + privileged: true + restart: always + volumes: + - /home/pi/.screenly:/data/.screenly + - /home/pi/screenly_assets:/data/screenly_assets + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + srly-ose-celery: + image: screenly/srly-ose-celery:${DOCKER_TAG} + depends_on: + - srly-ose-server + - redis + environment: + - HOME=/data + - CELERY_BROKER_URL=redis://redis:6379/0 + - CELERY_RESULT_BACKEND=redis://redis:6379/0 + privileged: true + restart: always + volumes: + - /home/pi/.screenly:/data/.screenly + - /home/pi/screenly_assets:/data/screenly_assets + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + redis: + image: screenly/srly-ose-redis:${DOCKER_TAG} + +volumes: + resin-data: diff --git a/docker/Dockerfile.celery b/docker/Dockerfile.celery index 7cb1c7477..ff75179c2 100644 --- a/docker/Dockerfile.celery +++ b/docker/Dockerfile.celery @@ -7,7 +7,6 @@ RUN mkdir -p /usr/src/app WORKDIR /usr/src/app COPY . /usr/src/app/ - CMD celery worker \ -A server.celery \ -B -n worker@screenly \ From f5a2073146be6cf6423ae8019a0f69fdc9274f72 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 19 Nov 2020 17:52:34 +0000 Subject: [PATCH 106/224] More install fixes. --- bin/install.sh | 1 + docker-compose.override.yml | 1 - docker/Dockerfile.viewer | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/install.sh b/bin/install.sh index 5b10e8e83..ff64e0ccb 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -183,6 +183,7 @@ sudo -E ansible-playbook site.yml "${EXTRA_ARGS[@]}" sudo docker-compose \ -f /home/pi/screenly/docker-compose.yml \ + -f /home/pi/screenly/docker-compose.override.yml \ pull sudo docker-compose \ diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 863e79d56..9241dd612 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -69,4 +69,3 @@ services: image: screenly/srly-ose-redis:${DOCKER_TAG} volumes: - resin-data: diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index d1bb85059..691ae52b2 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -100,6 +100,8 @@ RUN mkdir -p /usr/local/share/ScreenlyWebview COPY --from=viewer-builder /src/ScreenlyWebview /usr/local/bin/ COPY --from=viewer-builder /src/res /usr/local/share/ScreenlyWebview/ +ENV QT_QPA_EGLFS_FORCE888=1 + WORKDIR /usr/src/app RUN mkdir -p /usr/src/app COPY . /usr/src/app/ From aeb639c15beb2960d32c9ecf02c973495db76ad2 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 19 Nov 2020 17:58:34 +0000 Subject: [PATCH 107/224] Fixes syntax --- docker-compose.override.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 9241dd612..f830d350d 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -69,3 +69,4 @@ services: image: screenly/srly-ose-redis:${DOCKER_TAG} volumes: + screenly-data: From c8393e5bec8802c2c8cae183b1a8ae02fdaa948c Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 09:20:04 +0000 Subject: [PATCH 108/224] More cleanup. --- ansible/roles/screenly/tasks/main.yml | 35 ------------------------ bin/install.sh | 7 ++--- bin/start_server.sh | 39 +++++++++++++-------------- 3 files changed, 20 insertions(+), 61 deletions(-) diff --git a/ansible/roles/screenly/tasks/main.yml b/ansible/roles/screenly/tasks/main.yml index 20dc5dba4..1feca09e3 100644 --- a/ansible/roles/screenly/tasks/main.yml +++ b/ansible/roles/screenly/tasks/main.yml @@ -9,14 +9,6 @@ - .config - screenly_assets -- name: Copy Screenly default config - copy: - owner: pi - group: pi - src: screenly.conf - dest: /home/pi/.screenly/screenly.conf - force: no - - name: Copy Screenly default assets file copy: owner: pi @@ -36,22 +28,6 @@ requirements: /home/pi/screenly/requirements/requirements.host.txt extra_args: "--no-cache-dir --upgrade" -- name: Create default assets database if does not exists - copy: - owner: pi - group: pi - src: screenly.db - dest: /home/pi/.screenly/screenly.db - force: no - -# This needs to be moved into Docker -- name: Run database migration - become_user: pi - command: python /home/pi/screenly/bin/migrate.py - register: migrate - -- debug: msg="{{ migrate.stdout }}" - - name: Remove screenly_utils.sh file: state: absent @@ -146,14 +122,3 @@ path: "/etc/systemd/system/{{ item }}" state: absent with_items: "{{ deprecated_screenly_systemd_units }}" - -- name: Check /proc/device-tree/model file - command: cat /proc/device-tree/model - register: model_file - -- debug: - msg: "Device type: {{ device_type }}" - -- debug: - msg: "Use {{ docker_tag }} version of images." - diff --git a/bin/install.sh b/bin/install.sh index ff64e0ccb..eb5ba23be 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -127,6 +127,8 @@ fi if grep -qF "Raspberry Pi 4" /proc/device-tree/model; then export DEVICE_TYPE="pi4" + echo "Raspberry Pi 4 is currently unsupported. Exiting." + exit 1 elif grep -qF "Raspberry Pi 3" /proc/device-tree/model; then export DEVICE_TYPE="pi3" elif grep -qF "Raspberry Pi 2" /proc/device-tree/model; then @@ -160,11 +162,6 @@ sudo apt-get purge -y python-setuptools python-pip python-pyasn1 sudo apt-get install -y python-dev git-core libffi-dev libssl-dev whois curl -s https://bootstrap.pypa.io/get-pip.py | sudo python -# users who chose experimental and then reverted back to master or production need docker removed -if [ "$BRANCH" != "experimental" ]; then - sudo apt-get purge -y docker-ce docker-ce-cli containerd.io > /dev/null -fi - if [ "$NETWORK" == 'y' ]; then export MANAGE_NETWORK=true sudo apt-get install -y network-manager diff --git a/bin/start_server.sh b/bin/start_server.sh index e97d6d565..3cb22ce5c 100755 --- a/bin/start_server.sh +++ b/bin/start_server.sh @@ -1,29 +1,26 @@ #!/bin/bash -# If we're running inside Balena -if [ -n ${BALENA_DEVICE_UUID+x} ]; then - mkdir -p \ - /data/.config \ - /data/.screenly \ - /data/screenly_assets +mkdir -p \ + /data/.config \ + /data/.screenly \ + /data/screenly_assets - cp -n /usr/src/app/ansible/roles/screenly/files/screenly.conf /data/.screenly/screenly.conf - cp -n /usr/src/app/ansible/roles/screenly/files/default_assets.yml /data/.screenly/default_assets.yml - cp -n /usr/src/app/ansible/roles/screenly/files/screenly.db /data/.screenly/screenly.db +cp -n /usr/src/app/ansible/roles/screenly/files/screenly.conf /data/.screenly/screenly.conf +cp -n /usr/src/app/ansible/roles/screenly/files/default_assets.yml /data/.screenly/default_assets.yml +cp -n /usr/src/app/ansible/roles/screenly/files/screenly.db /data/.screenly/screenly.db - if [ -n "${OVERWRITE_CONFIG}" ]; then - echo "Requested to overwrite Screenly config file." - cp /usr/src/app/ansible/roles/screenly/files/screenly.conf "/data/.screenly/screenly.conf" - fi - - # Set management page's user and password from environment variables, - # but only if both of them are provided. Can have empty values provided. - if [ -n "${MANAGEMENT_USER+x}" ] && [ -n "${MANAGEMENT_PASSWORD+x}" ]; then - sed -i -e "s/^user=.*/user=${MANAGEMENT_USER}/" -e "s/^password=.*/password=${MANAGEMENT_PASSWORD}/" /data/.screenly/screenly.conf - fi +if [ -n "${OVERWRITE_CONFIG}" ]; then + echo "Requested to overwrite Screenly config file." + cp /usr/src/app/ansible/roles/screenly/files/screenly.conf "/data/.screenly/screenly.conf" +fi - echo "Running migration..." - python ./bin/migrate.py +# Set management page's user and password from environment variables, +# but only if both of them are provided. Can have empty values provided. +if [ -n "${MANAGEMENT_USER+x}" ] && [ -n "${MANAGEMENT_PASSWORD+x}" ]; then + sed -i -e "s/^user=.*/user=${MANAGEMENT_USER}/" -e "s/^password=.*/password=${MANAGEMENT_PASSWORD}/" /data/.screenly/screenly.conf fi +echo "Running migration..." +python ./bin/migrate.py + python server.py From 16bac34a5f3e426e7f6ed7d490ea1b19debd7873 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 09:42:17 +0000 Subject: [PATCH 109/224] Tweak to GitHub Actions --- .github/workflows/docker-build.yaml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index e54535175..014023176 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -25,19 +25,5 @@ jobs: - name: Available platforms run: echo ${{ steps.buildx.outputs.platforms }} - - name: Building websocket container - run: | - docker buildx build \ - --platform linux/arm/v6,linux/arm/v7 \ - -t "screenly/srly-ose-websocket" \ - -f docker/Dockerfile.websocket . - -# - name: Building viewer containers -# run: | -# for pi_version in pi1 pi2 pi3; do -# docker buildx build \ -# --platform linux/arm/v6,linux/arm/v7 \ -# --build-arg "PI_VERSION=$pi_version" \ -# -f docker/Dockerfile.viewer \ -# -t "screenly/srly-ose-viewer:$pi_version" . -# done + - name: Building container + run: ./bin/build_containers.sh From 600e5384388612602cbdcfc24aa5bb4a16475db6 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 10:13:21 +0000 Subject: [PATCH 110/224] Cleanup --- .dockerignore | 1 + .github/workflows/docker-build.yaml | 9 +- .github/workflows/docker-builds.yaml.disabled | 141 ------------------ .gitignore | 4 - 4 files changed, 9 insertions(+), 146 deletions(-) delete mode 100644 .github/workflows/docker-builds.yaml.disabled diff --git a/.dockerignore b/.dockerignore index b33298c01..6d4e1ea7d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -39,3 +39,4 @@ node_modules venv docker/* +docker-compose.* diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index 014023176..794775c83 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -1,4 +1,4 @@ -name: ci +name: Docker Image Build on: push: @@ -25,5 +25,12 @@ jobs: - name: Available platforms run: echo ${{ steps.buildx.outputs.platforms }} + - name: Login to DockerHub + if: success() && github.event_name != 'pull_request' + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Building container run: ./bin/build_containers.sh diff --git a/.github/workflows/docker-builds.yaml.disabled b/.github/workflows/docker-builds.yaml.disabled deleted file mode 100644 index 9149664f5..000000000 --- a/.github/workflows/docker-builds.yaml.disabled +++ /dev/null @@ -1,141 +0,0 @@ -name: ci - -on: - pull_request: - branches: - - experimental - - experimental-fixes - push: - branches: - - experimental - - experimental-fixes - -jobs: - build: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - buildx-version: - - latest - - v0.2.2 - qemu-version: - - latest - - 4.2.0-7 - steps: - - name: Runner info - run: | - sudo apt-get install -y hwinfo - sudo hwinfo --short - sudo mount - - name: Set up Docker Buildx - id: buildx - uses: ./ - with: - buildx-version: ${{ matrix.buildx-version }} - qemu-version: ${{ matrix.qemu-version }} - - name: Available platforms - run: echo ${{ steps.buildx.outputs.platforms }} - - - name: Run Buildx - run: | - docker buildx build \ - --platform linux/arm/v6,linux/arm/v7 \ - --output "type=image,push=false" \ - --file ./test/Dockerfile ./test - - - name: Run Buildx (sudo) - run: | - docker buildx build \ - --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x \ - --output "type=image,push=false" \ - --file ./test/Dockerfile-sudo ./test - - cache: - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v2.3.3 - - - name: Set up Docker Buildx - id: buildx - uses: ./ - - - name: Cache Docker layers - uses: actions/cache@v2 - id: cache - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx- - - - name: Docker Buildx (build) - run: | - docker buildx build \ - --cache-from "type=local,src=/tmp/.buildx-cache" \ - --cache-to "type=local,dest=/tmp/.buildx-cache" \ - --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x \ - --output "type=image,push=false" \ - --tag crazymax/ghaction-docker-buildx:cache \ - --file ./test/Dockerfile-diun ./test - - - name: Login to DockerHub - if: success() && github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Docker Buildx (push) - if: success() && github.event_name != 'pull_request' - run: | - docker buildx build \ - --cache-from "type=local,src=/tmp/.buildx-cache" \ - --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x \ - --output "type=image,push=true" \ - --tag crazymax/ghaction-docker-buildx:cache \ - --file ./test/Dockerfile-diun ./test - - - name: Inspect image - if: always() && github.event_name != 'pull_request' - run: | - docker buildx imagetools inspect crazymax/ghaction-docker-buildx:cache - - push: - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v2.3.3 - - - name: Prepare - id: prepare - run: | - DOCKER_PLATFORMS=linux/arm/v6,linux/arm/v7 - VERSION=edge - - name: Set up Docker Buildx - uses: ./ - - - name: Docker Buildx (build) - run: | - docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }} - - - name: Login to DockerHub - if: success() && github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Docker Buildx (push) - if: success() && github.event_name != 'pull_request' - run: | - docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} - - - name: Inspect image - if: always() && github.event_name != 'pull_request' - run: | - docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }} diff --git a/.gitignore b/.gitignore index adcc0e48b..38857cf77 100644 --- a/.gitignore +++ b/.gitignore @@ -36,8 +36,4 @@ pip-log.txt venv node_modules *.retry - .env - -.git/* -docks/* From 438910ad105bb72e2400d074b6874fedbb2fd5ef Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 10:22:49 +0000 Subject: [PATCH 111/224] Switches off hard coding of docker tag --- bin/build_containers.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/build_containers.sh b/bin/build_containers.sh index f47358909..a3644bbc1 100755 --- a/bin/build_containers.sh +++ b/bin/build_containers.sh @@ -5,8 +5,7 @@ set -euo pipefail -#GITBRANCH=$(git rev-parse --abbrev-ref HEAD) -GITBRANCH='latest' +GITBRANCH=$(git rev-parse --abbrev-ref HEAD) if [ -n "${CROSS_COMPILE+x}" ]; then echo "Running with cross-compile using docker buildx..." From e72c58a4dee7788b251d0c88114ec48ea76351a4 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 10:31:57 +0000 Subject: [PATCH 112/224] Adds documentation for WebView --- webview/README.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/webview/README.md b/webview/README.md index 9e3c76b73..cd6faaef9 100644 --- a/webview/README.md +++ b/webview/README.md @@ -1,4 +1,6 @@ -# QT Dependencies +## Building BQ Base + +Because the QT shiipped with Raspbian doens't come with all dependencies, we need to ship a separate version with the WebView. At the moment, this build will not work with cross-compiling, and needs to be done on a Raspberry Pi. @@ -17,3 +19,23 @@ $ docker run --rm -ti \ ``` This will output the files in a folder called `build/` in the current directory. + +## Usage + +DBus is used for communication. +Webview registers `screenly.webview` object at `/Screenly` address on the session bus. + +Webview provides 2 methods:`loadPage` and `loadImage`. + +Example of interaction (python): + +``` +from pydbus import SessionBus + +bus = SessionBus() +browser_bus = bus.get('screenly.webview', '/Screenly') + +browser_bus.loadPage("www.example.com") +``` + +Supported protocols: `http://`, `https://` From 677a465d1dc4acd3cb3cdbd2015f45feb728869b Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 15:43:18 +0000 Subject: [PATCH 113/224] Introduces Nginx container --- bin/build_containers.sh | 2 +- docker-compose.override.yml | 5 ++-- docker-compose.yml | 23 +++++++++++++++---- docker/Dockerfile.nginx | 3 +++ .../nginx/files => docker/nginx}/nginx.conf | 9 ++++++-- server.py | 2 +- 6 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 docker/Dockerfile.nginx rename {ansible/roles/nginx/files => docker/nginx}/nginx.conf (87%) diff --git a/bin/build_containers.sh b/bin/build_containers.sh index a3644bbc1..1f42d6cb2 100755 --- a/bin/build_containers.sh +++ b/bin/build_containers.sh @@ -15,7 +15,7 @@ else DOCKER_BUILD_ARGS=("build") fi -for container in base server celery redis websocket; do +for container in base server celery redis websocket nginx; do echo "Building $container" docker "${DOCKER_BUILD_ARGS[@]}" \ -f "docker/Dockerfile.$container" \ diff --git a/docker-compose.override.yml b/docker-compose.override.yml index f830d350d..c5c5b6e7c 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -33,6 +33,7 @@ services: - /home/pi/screenly_assets:/data/screenly_assets - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro + srly-ose-websocket: image: screenly/srly-ose-websocket:${DOCKER_TAG} depends_on: @@ -40,8 +41,6 @@ services: environment: - HOME=/data - LISTEN=0.0.0.0 - ports: - - 9999:9999 privileged: true restart: always volumes: @@ -49,6 +48,7 @@ services: - /home/pi/screenly_assets:/data/screenly_assets - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro + srly-ose-celery: image: screenly/srly-ose-celery:${DOCKER_TAG} depends_on: @@ -65,6 +65,7 @@ services: - /home/pi/screenly_assets:/data/screenly_assets - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro + redis: image: screenly/srly-ose-redis:${DOCKER_TAG} diff --git a/docker-compose.yml b/docker-compose.yml index c68614b43..0c98f6773 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,11 +4,8 @@ services: image: screenly/srly-ose-server:latest environment: - HOME=/data - - LISTEN=0.0.0.0 - CELERY_BROKER_URL=redis://redis:6379/0 - CELERY_RESULT_BACKEND=redis://redis:6379/0 - ports: - - 80:8080 privileged: true restart: always volumes: @@ -31,6 +28,7 @@ services: - resin-data:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro + srly-ose-websocket: image: screenly/srly-ose-websocket:latest depends_on: @@ -38,14 +36,14 @@ services: environment: - HOME=/data - LISTEN=0.0.0.0 - ports: - - 9999:9999 privileged: true restart: always volumes: - resin-data:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro + + srly-ose-celery: image: screenly/srly-ose-celery:latest depends_on: @@ -61,9 +59,24 @@ services: - resin-data:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro + redis: image: screenly/srly-ose-redis:latest restart: always + srly-ose-nginx: + image: screenly/srly-ose-nginx:latest + depends_on: + - srly-ose-server + environment: + - HOME=/data + depends_on: + - srly-ose-server + - srly-ose-websocket + restart: always + volumes: + - resin-data:/data + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro volumes: resin-data: diff --git a/docker/Dockerfile.nginx b/docker/Dockerfile.nginx new file mode 100644 index 000000000..4be7d2d15 --- /dev/null +++ b/docker/Dockerfile.nginx @@ -0,0 +1,3 @@ +FROM nginx:1-alpine + +COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/ansible/roles/nginx/files/nginx.conf b/docker/nginx/nginx.conf similarity index 87% rename from ansible/roles/nginx/files/nginx.conf rename to docker/nginx/nginx.conf index e17977dc7..1d99aee0a 100644 --- a/ansible/roles/nginx/files/nginx.conf +++ b/docker/nginx/nginx.conf @@ -1,11 +1,15 @@ upstream ose { - server 127.0.0.1:8080; + server srly-ose-server:8080; } upstream wifi-connect { server 192.168.42.1:9090; } +upstream websocket { + server srly-ose-websocket:9999; +} + server { server_tokens off; listen 80 default_server; @@ -42,7 +46,8 @@ server { } location /hotspot { - allow 127.0.0.1; + # Only allow from Docker's CIDR + allow 172.17.0.1/16; deny all; if (!-f /home/pi/.screenly/initialized) { diff --git a/server.py b/server.py index 5623ba6a1..df0c16345 100755 --- a/server.py +++ b/server.py @@ -1653,7 +1653,7 @@ def viewIndex(): if settings['use_ssl']: ws_addresses.append('wss://' + my_ip + '/ws/') else: - ws_addresses.append('ws://' + my_ip + ':' + settings['websocket_port']) + ws_addresses.append('ws://' + my_ip + '/ws/') if resin_uuid: ws_addresses.append('wss://{}.resindevice.io/ws/'.format(resin_uuid)) From b430725fb81b91e56fc77cfa56d76d88216139df Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 15:43:27 +0000 Subject: [PATCH 114/224] resin -> balena --- ansible/roles/network/tasks/main.yml | 12 ++++++------ ansible/roles/network/vars/main.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ansible/roles/network/tasks/main.yml b/ansible/roles/network/tasks/main.yml index dc6ee64b0..dc33a9022 100644 --- a/ansible/roles/network/tasks/main.yml +++ b/ansible/roles/network/tasks/main.yml @@ -73,7 +73,7 @@ - name: Check if resin-wifi-connect required version exist stat: - path: "/usr/local/share/wifi-connect/ui/{{ resin_wifi_connect_version }}" + path: "/usr/local/share/wifi-connect/ui/{{ balena_wifi_connect_version }}" register: resin_wifi_version_file when: - ansible_distribution_major_version|int >= 9 @@ -84,8 +84,8 @@ - name: Download balena wifi-connect release get_url: - url: "https://github.com/balena-io/wifi-connect/releases/download/v{{ resin_wifi_connect_version }}/wifi-connect-v{{ resin_wifi_connect_version }}-linux-rpi.tar.gz" - dest: /home/pi/resin-wifi-connect.tar.gz + url: "https://github.com/balena-io/wifi-connect/releases/download/v{{ balena_wifi_connect_version }}/wifi-connect-v{{ resin_wifi_connect_version }}-linux-rpi.tar.gz" + dest: /home/pi/balena-wifi-connect.tar.gz when: - ansible_distribution_major_version|int >= 9 - not resin_wifi_version_file_exist @@ -93,7 +93,7 @@ - name: Unarchive balena wifi-connect release unarchive: - src: /home/pi/resin-wifi-connect.tar.gz + src: /home/pi/balena-wifi-connect.tar.gz dest: /home/pi owner: pi group: pi @@ -125,7 +125,7 @@ - name: Touch balena wifi-connect version file file: state: touch - path: "/usr/local/share/wifi-connect/ui/{{ resin_wifi_connect_version }}" + path: "/usr/local/share/wifi-connect/ui/{{ balena_wifi_connect_version }}" when: - ansible_distribution_major_version|int >= 9 - not resin_wifi_version_file_exist @@ -138,7 +138,7 @@ with_items: - wifi-connect - ui - - resin-wifi-connect.tar.gz + - balena-wifi-connect.tar.gz when: - ansible_distribution_major_version|int >= 9 - not resin_wifi_version_file_exist diff --git a/ansible/roles/network/vars/main.yml b/ansible/roles/network/vars/main.yml index 3709d64ab..22ae95f98 100644 --- a/ansible/roles/network/vars/main.yml +++ b/ansible/roles/network/vars/main.yml @@ -1 +1 @@ -resin_wifi_connect_version: 4.2.13 +balena_wifi_connect_version: 4.2.13 From 1da5e85fc2718957585c195d689c1452316a3a26 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 15:45:42 +0000 Subject: [PATCH 115/224] tweaks ignore --- .dockerignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 6d4e1ea7d..84fb24f8b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -38,5 +38,4 @@ pip-log.txt node_modules venv -docker/* docker-compose.* From 89d5ee13724a16f31f3c0ff9d4f43670dfe6e205 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 15:53:13 +0000 Subject: [PATCH 116/224] Adds Nginx override --- docker-compose.override.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index c5c5b6e7c..b32d280b2 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -69,5 +69,21 @@ services: redis: image: screenly/srly-ose-redis:${DOCKER_TAG} + srly-ose-nginx: + image: screenly/srly-ose-nginx:${DOCKER_TAG} + depends_on: + - srly-ose-server + environment: + - HOME=/data + depends_on: + - srly-ose-server + - srly-ose-websocket + restart: always + volumes: + - /home/pi/.screenly:/data/.screenly + - /home/pi/screenly_assets:/data/screenly_assets + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + volumes: screenly-data: From 031bc02ab8e81db7ac2a901aa24f884c3217c208 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 15:56:27 +0000 Subject: [PATCH 117/224] Fixes nginx setup --- docker-compose.yml | 1 + docker/Dockerfile.nginx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0c98f6773..e5f2ea4cc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -78,5 +78,6 @@ services: - resin-data:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro + volumes: resin-data: diff --git a/docker/Dockerfile.nginx b/docker/Dockerfile.nginx index 4be7d2d15..09c20a0d5 100644 --- a/docker/Dockerfile.nginx +++ b/docker/Dockerfile.nginx @@ -1,3 +1,3 @@ FROM nginx:1-alpine -COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf +COPY docker/nginx/nginx.conf /etc/nginx/conf.d/srly-ose.conf From f56c8e9001fd8e8c44cd711375880e4c999b2105 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 15:59:03 +0000 Subject: [PATCH 118/224] Fixes paths --- docker/nginx/nginx.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index 1d99aee0a..4279e6810 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -15,10 +15,10 @@ server { listen 80 default_server; location / { - if (-f /home/pi/.screenly/initialized) { + if (-f /data/.screenly/initialized) { proxy_pass http://ose; } - if (!-f /home/pi/.screenly/initialized) { + if (!-f /data/.screenly/initialized) { proxy_pass http://wifi-connect; } @@ -50,7 +50,7 @@ server { allow 172.17.0.1/16; deny all; - if (!-f /home/pi/.screenly/initialized) { + if (!-f /data/.screenly/initialized) { root /tmp; rewrite ^ /hotspot.html break; } From e0a587f50991a4c7b12a271c7909d905c6d81ea8 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 16:29:18 +0000 Subject: [PATCH 119/224] Fixes CIDR in Nginx --- docker/nginx/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index 4279e6810..b3963ca9c 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -47,7 +47,7 @@ server { location /hotspot { # Only allow from Docker's CIDR - allow 172.17.0.1/16; + allow 172.17.0.0/16; deny all; if (!-f /data/.screenly/initialized) { From 6b82e7284f0b81113a2d8e9a6418a622f9bf5c4c Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 16:31:34 +0000 Subject: [PATCH 120/224] Clean out old Nginx code. --- ansible/roles/nginx/tasks/main.yml | 25 ------- ansible/roles/ssl/files/nginx.conf | 84 ------------------------ ansible/roles/ssl/files/nginx_resin.conf | 47 ------------- ansible/roles/ssl/files/screenly.crt | 21 ------ ansible/roles/ssl/files/screenly.key | 28 -------- ansible/roles/ssl/tasks/main.yml | 70 -------------------- ansible/site.yml | 2 - bin/install.sh | 8 +-- 8 files changed, 2 insertions(+), 283 deletions(-) delete mode 100644 ansible/roles/nginx/tasks/main.yml delete mode 100644 ansible/roles/ssl/files/nginx.conf delete mode 100644 ansible/roles/ssl/files/nginx_resin.conf delete mode 100644 ansible/roles/ssl/files/screenly.crt delete mode 100644 ansible/roles/ssl/files/screenly.key delete mode 100644 ansible/roles/ssl/tasks/main.yml diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml deleted file mode 100644 index 7cb3b3acf..000000000 --- a/ansible/roles/nginx/tasks/main.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -#- name: Check screenly.conf -# command: cat /home/pi/.screenly/screenly.conf -# register: config -# -#- set_fact: no_ssl="{{config.stdout.find('use_ssl = True') == -1}}" -# -#- name: Installs Nginx -# apt: -# name: nginx-light -# state: present -# update_cache: yes -# -#- name: Cleans up default config -# file: -# path: /etc/nginx/sites-enabled/default -# state: absent -# -#- name: Installs nginx config -# copy: -# src: nginx.conf -# dest: /etc/nginx/sites-enabled/screenly.conf -# mode: 644 -# owner: root -# group: root diff --git a/ansible/roles/ssl/files/nginx.conf b/ansible/roles/ssl/files/nginx.conf deleted file mode 100644 index 0f8a23a0a..000000000 --- a/ansible/roles/ssl/files/nginx.conf +++ /dev/null @@ -1,84 +0,0 @@ -upstream ose { - server 127.0.0.1:8080; -} - -upstream websocket { - server 127.0.0.1:9999; -} - -upstream wifi-connect { - server 192.168.42.1:9090; -} - -server { - server_tokens off; - listen 80 default_server; - - location / { - return 301 https://$host$request_uri; - } -} - -server { - server_tokens off; - listen 443 default_server; - - ssl on; - ssl_certificate /etc/ssl/screenly.crt; - ssl_certificate_key /etc/ssl/screenly.key; - - location / { - if (-f /home/pi/.screenly/initialized) { - proxy_pass http://ose; - } - if (!-f /home/pi/.screenly/initialized) { - proxy_pass http://wifi-connect; - } - - client_max_body_size 4G; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-Protocol https; - } - - location ~ ^/api/[0-9a-z]+/backup$ { - proxy_pass http://ose; - proxy_connect_timeout 1800; - proxy_send_timeout 1800; - proxy_read_timeout 1800; - send_timeout 1800; - - client_max_body_size 4G; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-Protocol https; - } - - location /static { - proxy_pass http://ose/static; - } - - location /ws/ { - proxy_pass http://websocket; - proxy_read_timeout 24d; - chunked_transfer_encoding off; - proxy_http_version 1.1; - proxy_buffering off; - - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $http_host; - } - - location /hotspot { - allow 127.0.0.1; - deny all; - - if (!-f /home/pi/.screenly/initialized) { - root /tmp; - rewrite ^ /hotspot.html break; - } - } -} diff --git a/ansible/roles/ssl/files/nginx_resin.conf b/ansible/roles/ssl/files/nginx_resin.conf deleted file mode 100644 index 5f7577315..000000000 --- a/ansible/roles/ssl/files/nginx_resin.conf +++ /dev/null @@ -1,47 +0,0 @@ -upstream ose { - server 127.0.0.1:8080; -} - -upstream websocket { - server 127.0.0.1:9999; -} - -server { - server_tokens off; - listen 80 default_server; - - location / { - client_max_body_size 4G; - proxy_pass http://ose; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-Protocol https; - } - - location ~ ^/api/[0-9a-z]+/backup$ { - proxy_pass http://ose; - proxy_connect_timeout 1800; - proxy_send_timeout 1800; - proxy_read_timeout 1800; - send_timeout 1800; - - client_max_body_size 4G; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-Protocol https; - } - - location /ws/ { - proxy_pass http://websocket; - proxy_read_timeout 24d; - chunked_transfer_encoding off; - proxy_http_version 1.1; - proxy_buffering off; - - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $http_host; - } -} diff --git a/ansible/roles/ssl/files/screenly.crt b/ansible/roles/ssl/files/screenly.crt deleted file mode 100644 index 34f03cea9..000000000 --- a/ansible/roles/ssl/files/screenly.crt +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDdzCCAl+gAwIBAgIJAN+OcHLBe0iHMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRUwEwYDVQQKDAxXaXJlTG9hZCBJ -bmMxFzAVBgNVBAMMDnNjcmVlbmx5LmxvY2FsMB4XDTE4MDIyODA4MzUyM1oXDTI4 -MDIyODA4MzUyM1owUjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx -FTATBgNVBAoMDFdpcmVMb2FkIEluYzEXMBUGA1UEAwwOc2NyZWVubHkubG9jYWww -ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPPVMqJTLiKw4+uSOS72/Y -ZgxOaajHPRt47oSHqkHEfvDfIULSqsX4LJkQroP85bK9EmwmWZ5INUNbwy364xHK -M2i6p9fv8nG1wAYa1thhWian5VN9VV4jf8zdM3uYYKwYUg+hlXxJlgQVMVUQ8Sdq -oPLG/0/Qmk4cSXHq3vlT/NDzQVUQZn8BNTZ5oTpASbEotzHpf3+lF77V6ql88ytO -9r/ds2vZ8oOWQ0TiugP/cKwImYExTT8GGWeX9H6zMInbfAO3MhmwmXmymeDy6VZD -a5uDKxbD9ui4zRDQRsTolagy17FkjIm8kkPfDdhVxDJtvnrgXzWF/IjRloPsykDJ -AgMBAAGjUDBOMB0GA1UdDgQWBBSSz3mZLOfI0l+jv8JsKAU9n6SFFDAfBgNVHSME -GDAWgBSSz3mZLOfI0l+jv8JsKAU9n6SFFDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3 -DQEBCwUAA4IBAQA3g/JCy9JNPCODy9CNIDEFWLPyPzrAoxZOSQPVsvFZr6h5En4N -KBrTGaeoPRYRLqQOAIq6D4a4bV0JgEiFMTd93XIglbt6KHkqLFPAnb96JNrbqsLx -7ESgvFN03TovqT2u7M3uj/qjeWG6ZP8Py36jjuwaBwkvp4HdirxsPSYH+sJluFr4 -QgUYnVZPWJYGQE3nHuAT+LJ7EjVVJj0QWcjIR/l3ckgnACinXc0Mik4Fheh1gAgI -k2cK6HBGveFuekbOdu35o5zFvTt0L3wPQzd+VkuPfkfv1iF9YqeiJOvW8W/PH9z3 -VW/psItcnkU4bH2asTEL8ryC/+0x7xoAUlys ------END CERTIFICATE----- diff --git a/ansible/roles/ssl/files/screenly.key b/ansible/roles/ssl/files/screenly.key deleted file mode 100644 index a5bacd21f..000000000 --- a/ansible/roles/ssl/files/screenly.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDPPVMqJTLiKw4+ -uSOS72/YZgxOaajHPRt47oSHqkHEfvDfIULSqsX4LJkQroP85bK9EmwmWZ5INUNb -wy364xHKM2i6p9fv8nG1wAYa1thhWian5VN9VV4jf8zdM3uYYKwYUg+hlXxJlgQV -MVUQ8SdqoPLG/0/Qmk4cSXHq3vlT/NDzQVUQZn8BNTZ5oTpASbEotzHpf3+lF77V -6ql88ytO9r/ds2vZ8oOWQ0TiugP/cKwImYExTT8GGWeX9H6zMInbfAO3MhmwmXmy -meDy6VZDa5uDKxbD9ui4zRDQRsTolagy17FkjIm8kkPfDdhVxDJtvnrgXzWF/IjR -loPsykDJAgMBAAECggEAS93vbCZiElogxOWSGGB/WYFCUBJuL0I3pHXtHp09pmmy -VH0gsW7DOq9Y+bppp1OPs5fi78cvItAc8KLrWkV2ZcecN3jqnHTtG9RIZ9rvK/SM -4joZ7nAqHmTS4sfOH2KEngKspkLLVUUOCZQdyC4AeBCj0CX3Wi6jGcfpZEpsjEoA -pbp1HhgJTs6GNdOKcGWYaTJt1lj5/MFdOgwX4F9gGMv9YD7+0ORBL+pflNA5F7YO -QIprGYU43Q3i2iBofImkl0TmKS6zL8inrcQ6YNY+jxZjc1YyC+C3cv0qFmIx0uu5 -/psoin3IgruFfv0Oq4VOvA7p6TLFhVLt0Jr/V3ZMAQKBgQDrSOhHaN9rHEm2QCBA -gdV9dmaYAfJMIAERSEb/Dwsb18tNR9Ft5vXixED3QG1GqhQdMWBCoQ9vDuYKjmSx -4wozdrh3IX0EyRAhxagi9QYlWbg6yHHtWdk+XaTGiVHQDh9gPFbJaqbok6aArqdk -xR3jD3EFNYf+r6CVsHaUDBRs8QKBgQDhfE4C5Jd5OyMabUy7N5T45SkA7Yof6S6k -uYBOMOF7iBz0obOQr/HvkJV468xgt3OKwiHRAJL6XbvFxrBLhcbkFZ4aTksEBNwm -brzm03S9RrE3ezJRbVSEgFNt1c6Km9UmpZxm2U6B05n7wdRWR590/5N6XG24gDlu -GReSdzpxWQKBgQCoLMi6oh9v9BxMBLII6cSrlQHoDRwfhZC9xafZj+skz64lYvwz -Ti7bE+RL1uVE6TTPWQexGGZrv352dSlMbThRaL6ZiHpP/VdmjF2N/w2RjPu+KKAm -Q16g0VaCAo1T5YRPyVFPTshW3ZLZz/0ebjbaoaLrUkQOq4Jg/G0FjUzcQQKBgQDd -4h46Botvxluyo5+AEx/LFGWW/iiPYjx95/Rz/PHFR5mGuKAkXp6qaRJNHWvOOHfA -MWxpaDE5oYcnBW9xwcCHrSYZKLX0zHt+bjYAxk/3+VpmCBrpubYTdNukF2LZTqMf -FpSjOG9incDG1mOGS5CD5wNOwylNBxB8YMCrZhvicQKBgCcfK/hRQazPW9EZlP9t -pkv9Aujwql9gqAwI2EDe4/aesUn5TWvd8PvPoymbTguHNdQq8AoB/IUEhYpNVPCc -AsRgJUSU//G0D7swhLy7zdXQt2EdE+3V8riAayPia4LefUpVEQG0szoS+UFdorxM -BMvXYWZxzHAvp0KUr3G9S+dr ------END PRIVATE KEY----- diff --git a/ansible/roles/ssl/tasks/main.yml b/ansible/roles/ssl/tasks/main.yml deleted file mode 100644 index 48126ce66..000000000 --- a/ansible/roles/ssl/tasks/main.yml +++ /dev/null @@ -1,70 +0,0 @@ ---- -- name: Check screenly.conf - command: cat /home/pi/.screenly/screenly.conf - register: config - tags: - - enable-ssl - -- set_fact: no_use_ssl_parameter="{{config.stdout.find('use_ssl') == -1}}" - tags: - - enable-ssl - -- name: Installs Nginx - apt: - name: nginx-light - state: present - update_cache: yes - tags: - - enable-ssl - -- name: Cleans up default config - file: - path: /etc/nginx/sites-enabled/default - state: absent - tags: - - enable-ssl - -- name: Installs nginx config - copy: - src: nginx.conf - dest: /etc/nginx/sites-enabled/screenly.conf - mode: 644 - owner: root - group: root - notify: - - restart-nginx - tags: - - enable-ssl - -- name: Installs self-signed certificates - copy: - src: "{{ item }}" - dest: "/etc/ssl/{{ item }}" - mode: 0600 - owner: root - group: root - force: no - with_items: - - screenly.crt - - screenly.key - tags: - - enable-ssl - -- name: Turn on the ssl mode - lineinfile: - dest: /home/pi/.screenly/screenly.conf - insertafter: '^.*database.*' - regexp: '^.*database.*;' - line: 'use_ssl = True' - tags: - - enable-ssl - when: no_use_ssl_parameter - -- name: Turns on the ssl mode - replace: - replace: 'use_ssl = True' - regexp: '^.*use_ssl.*' - dest: /home/pi/.screenly/screenly.conf - tags: - - enable-ssl - when: not no_use_ssl_parameter diff --git a/ansible/site.yml b/ansible/site.yml index f0625ca9b..54bd565ef 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -18,6 +18,4 @@ - screenly - network - splashscreen - - nginx - - ssl - tools diff --git a/bin/install.sh b/bin/install.sh index eb5ba23be..ec20f04d3 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -83,9 +83,7 @@ esac echo && read -p "Would you like to perform a full system upgrade as well? (y/N)" -n 1 -r -s UPGRADE && echo if [ "$UPGRADE" != 'y' ]; then - EXTRA_ARGS="--skip-tags enable-ssl,system-upgrade" - else - EXTRA_ARGS="--skip-tags enable-ssl" + EXTRA_ARGS="--skip-tags system-upgrade" fi elif [ "$WEB_UPGRADE" = true ]; then @@ -112,9 +110,7 @@ elif [ "$WEB_UPGRADE" = true ]; then fi if [ "$UPGRADE_SYSTEM" = false ]; then - EXTRA_ARGS=("--skip-tags" "enable-ssl,system-upgrade") - elif [ "$UPGRADE_SYSTEM" = true ]; then - EXTRA_ARGS=("--skip-tags" "enable-ssl") + EXTRA_ARGS=("--skip-tags" "system-upgrade") else echo -e "Invalid -s parameter." exit 1 From 6acc5109a874f8b99c0b10db87d08ca90724b6fe Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 16:54:58 +0000 Subject: [PATCH 121/224] Migrate in Ngrok/migration tools to Nginx container. --- ansible/roles/tools/files/nginx.conf | 6 ------ ansible/roles/tools/tasks/main.yml | 8 -------- bin/install.sh | 12 ++++++++++-- docker-compose.yml | 1 - docker/nginx/nginx.conf | 12 ++++++++++++ tools/assets-migration-to-screenly-pro.py | 4 ++-- 6 files changed, 24 insertions(+), 19 deletions(-) delete mode 100644 ansible/roles/tools/files/nginx.conf diff --git a/ansible/roles/tools/files/nginx.conf b/ansible/roles/tools/files/nginx.conf deleted file mode 100644 index 1452c6f2f..000000000 --- a/ansible/roles/tools/files/nginx.conf +++ /dev/null @@ -1,6 +0,0 @@ -server { - listen 127.0.0.1:8000; - server_name *.ngrok.io; - root /home/pi/screenly_assets; - try_files $uri /home/pi/screenly_assets$uri; -} diff --git a/ansible/roles/tools/tasks/main.yml b/ansible/roles/tools/tasks/main.yml index c9bb17de8..115b58c95 100644 --- a/ansible/roles/tools/tasks/main.yml +++ b/ansible/roles/tools/tasks/main.yml @@ -5,11 +5,3 @@ mode: 0755 owner: root group: root - -- name: Installs nginx config - copy: - src: nginx.conf - dest: /etc/nginx/sites-enabled/screenly_assets.conf - mode: 644 - owner: root - group: root diff --git a/bin/install.sh b/bin/install.sh index ec20f04d3..666c71172 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -154,8 +154,16 @@ fi sudo sed -i 's/apt.screenlyapp.com/archive.raspbian.org/g' /etc/apt/sources.list sudo apt update -y -sudo apt-get purge -y python-setuptools python-pip python-pyasn1 -sudo apt-get install -y python-dev git-core libffi-dev libssl-dev whois +sudo apt-get purge -y \ + python-setuptools \ + python-pip \ + python-pyasn1 +sudo apt-get install -y \ + python-dev \ + git-core \ + libffi-dev \ + libssl-dev \ + whois curl -s https://bootstrap.pypa.io/get-pip.py | sudo python if [ "$NETWORK" == 'y' ]; then diff --git a/docker-compose.yml b/docker-compose.yml index e5f2ea4cc..f4cbff08a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,7 +43,6 @@ services: - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro - srly-ose-celery: image: screenly/srly-ose-celery:latest depends_on: diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index b3963ca9c..9683d66dd 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -56,3 +56,15 @@ server { } } } + +server { + # Only allow from localhost and Docker's CIDR + allow 172.17.0.0/16; + allow 172.0.0.1; + deny all; + + server_name *.ngrok.io; + listen 80; + root /data/screenly_assets; + try_files $uri /data/screenly_assets$uri; +} diff --git a/tools/assets-migration-to-screenly-pro.py b/tools/assets-migration-to-screenly-pro.py index 8db832c51..c406eea58 100644 --- a/tools/assets-migration-to-screenly-pro.py +++ b/tools/assets-migration-to-screenly-pro.py @@ -14,10 +14,10 @@ HOME = os.getenv('HOME', '/home/pi') BASE_API_SCREENLY_URL = 'https://api.screenlyapp.com' -ASSETS_SCREENLY_OSE_API = 'http://127.0.0.1:8080/api/v1.1/assets' +ASSETS_SCREENLY_OSE_API = 'http://127.0.0.1/api/v1.1/assets' PORT_NGROK = 4040 -PORT = 8000 +PORT = 80 token = None ngrok_public_url = None From 843fdb52bdd0c3c6926b704ddf52e46967c3cc9d Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 16:55:54 +0000 Subject: [PATCH 122/224] Docker tweaks. --- docker-compose.override.yml | 4 ++-- docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index b32d280b2..28774a64a 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -80,8 +80,8 @@ services: - srly-ose-websocket restart: always volumes: - - /home/pi/.screenly:/data/.screenly - - /home/pi/screenly_assets:/data/screenly_assets + - /home/pi/.screenly:/data/.screenly:ro + - /home/pi/screenly_assets:/data/screenly_assets:ro - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/docker-compose.yml b/docker-compose.yml index f4cbff08a..245681fc9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -74,7 +74,7 @@ services: - srly-ose-websocket restart: always volumes: - - resin-data:/data + - resin-data:/data:ro - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro From 88c3dd7fb86d064476f8031561107510a1785ee0 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 17:28:36 +0000 Subject: [PATCH 123/224] Fixes syntax in install --- bin/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/install.sh b/bin/install.sh index 55f96d3ce..f52db36ab 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -83,7 +83,7 @@ esac echo && read -p "Would you like to perform a full system upgrade as well? (y/N)" -n 1 -r -s UPGRADE && echo if [ "$UPGRADE" != 'y' ]; then - EXTRA_ARGS="--skip-tags system-upgrade" + EXTRA_ARGS=("--skip-tags" "system-upgrade") fi elif [ "$WEB_UPGRADE" = true ]; then From 82ab01df02af86b35f2edb4941b70cef4c1fb479 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Fri, 20 Nov 2020 17:33:21 +0000 Subject: [PATCH 124/224] Fixes sudo run for docker-compose --- bin/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/install.sh b/bin/install.sh index f52db36ab..0938a4e48 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -182,12 +182,12 @@ cd /home/pi/screenly/ansible sudo -E ansible-playbook site.yml "${EXTRA_ARGS[@]}" -sudo docker-compose \ +sudo -E docker-compose \ -f /home/pi/screenly/docker-compose.yml \ -f /home/pi/screenly/docker-compose.override.yml \ pull -sudo docker-compose \ +sudo -E docker-compose \ -f /home/pi/screenly/docker-compose.yml \ -f /home/pi/screenly/docker-compose.override.yml \ up -d From fba2b15f039e37dc66ec8186f610c019bdc51b01 Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Tue, 24 Nov 2020 12:03:02 +0600 Subject: [PATCH 125/224] Task: remove nginx --- ansible/roles/system/tasks/main.yml | 2 ++ ansible/site.yml | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ansible/roles/system/tasks/main.yml b/ansible/roles/system/tasks/main.yml index cb01432fd..4ee5d8872 100644 --- a/ansible/roles/system/tasks/main.yml +++ b/ansible/roles/system/tasks/main.yml @@ -179,6 +179,8 @@ - lightdm - lightdm-gtk-greeter - matchbox + - nginx-common + - nginx-light - pix-plym-splash - rabbitmq-server - redis-server diff --git a/ansible/site.yml b/ansible/site.yml index 54bd565ef..e5c7b0024 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -7,12 +7,6 @@ docker_tag: "{{ lookup('env', 'DOCKER_TAG') }}" device_type: "{{ lookup('env', 'DEVICE_TYPE') }}" - handlers: - - name: restart-nginx - service: - name: nginx - state: restarted - roles: - system - screenly From df18b5f727a73e0c96781ef5ea3177ff70b39f07 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Tue, 24 Nov 2020 13:29:10 +0000 Subject: [PATCH 126/224] Adds build steps for qt builder for pi4 --- webview/Dockerfile | 6 ++- webview/build_qtbase.sh | 113 +++++++++++++++++----------------------- 2 files changed, 51 insertions(+), 68 deletions(-) diff --git a/webview/Dockerfile b/webview/Dockerfile index ffe307668..ea5b1cfeb 100644 --- a/webview/Dockerfile +++ b/webview/Dockerfile @@ -9,17 +9,19 @@ RUN apt-get update && \ freetds-dev \ g++ \ git \ + libgbm-dev \ + libgles2-mesa-dev \ libinput-dev \ - lsb-release \ libqt5gui5 \ libqt5webkit5-dev \ libqt5x11extras5-dev \ - libraspberrypi0 \ libraspberrypi-dev \ + libraspberrypi0 \ libts-dev \ libudev-dev \ libxcb-xinerama0 \ libxcb-xinerama0-dev \ + lsb-release \ make && \ apt-get build-dep libqt5gui5 && \ apt-get clean diff --git a/webview/build_qtbase.sh b/webview/build_qtbase.sh index 694bc6c31..bc352e77f 100755 --- a/webview/build_qtbase.sh +++ b/webview/build_qtbase.sh @@ -5,95 +5,76 @@ set -euo pipefail -QT_PI_1=/src/qt5/pi_1 # For Pi 1 and Pi Zero -QT_PI_2=/src/qt5/pi_2 # For Pi 2 -QT_PI_3=/src/qt5/pi_3 # For Pi 3 BUILD_TARGET=/build -QT_BRANCH="5.9" +QT_BRANCH="5.15" DEBIAN_VERSION=$(lsb_release -cs) mkdir -p "$BUILD_TARGET" echo "Building QT Base version $QT_BRANCH." -if [ ! -f "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi1.tar.gz" ]; then - echo "Building QT Base for Pi 1" - mkdir -p "$QT_PI_1" - cd "$QT_PI_1" - git clone git://code.qt.io/qt/qtbase.git -b "$QT_BRANCH" - cd qtbase - ./configure \ - -release \ - -opengl es2 \ - -device linux-rasp-pi-g++ \ - -device-option CROSS_COMPILE=/usr/bin/ \ - -opensource \ - -confirm-license \ - -make libs \ - -prefix /usr/local/qt5pi \ - -extprefix $QT_PI_1/qt5pi \ - -no-use-gold-linker +function build_qtbase () { + if [ ! -f "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-$1.tar.gz" ]; then + SRC_DIR="/src/$1" + echo "Building QT Base for $1" + mkdir -p "$SRC_DIR" + cd "$SRC_DIR" + git clone git://code.qt.io/qt/qtbase.git -b "$QT_BRANCH" + cd qtbase + ./configure \ + -release \ + -no-compile-examples \ + -opengl es2 \ + -device "linux-rasp-$1-g++" \ + -device-option CROSS_COMPILE=/usr/bin/ \ + -opensource \ + -confirm-license \ + -make libs \ + -prefix /usr/local/qt5pi \ + -extprefix "$SRC_DIR/qt5pi" \ + -no-use-gold-linker - make -j "$(nproc --all)" - make install - cp -r /usr/share/fonts/truetype/dejavu/ "$QT_PI_1/qt5pi/lib/fonts" - cd "$QT_PI_1" - tar -zcvf "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi1.tar.gz" qt5pi - cd "$BUILD_TARGET" - sha256sum "qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi1.tar.gz" > "qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi1.tar.gz.sha256" -fi + make -j "$(nproc --all)" + make install + cp -r /usr/share/fonts/truetype/dejavu/ "$SRC_DIR/qt5pi/lib/fonts" + cd "$SRC_DIR" + tar -zcvf "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-$1.tar.gz" qt5pi + cd "$BUILD_TARGET" + sha256sum "qtbase-$QT_BRANCH-$DEBIAN_VERSION-$1.tar.gz" > "qtbase-$QT_BRANCH-$DEBIAN_VERSION-$1.tar.gz.sha256" + else + echo "Build already exist." + fi +} -if [ ! -f "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi2.tar.gz" ]; then - echo "Building QT Base for Pi 2" - mkdir -p "$QT_PI_2" - cd "$QT_PI_2" - git clone git://code.qt.io/qt/qtbase.git -b "$QT_BRANCH" - cd qtbase - ./configure \ - -release \ - -opengl es2 \ - -device linux-rasp-pi2-g++ \ - -device-option CROSS_COMPILE=/usr/bin/ \ - -opensource \ - -confirm-license \ - -make libs \ - -prefix /usr/local/qt5pi \ - -extprefix "$QT_PI_2/qt5pi" \ - -no-use-gold-linker - - make -j "$(nproc --all)" - make install - cp -r /usr/share/fonts/truetype/dejavu/ "$QT_PI_2/qt5pi/lib/fonts" - cd "$QT_PI_2" - tar -zcvf "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi2.tar.gz" qt5pi - cd "$BUILD_TARGET" - sha256sum "qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi2.tar.gz" > "qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi2.tar.gz.sha256" -fi +build_qtbase pi +build_qtbase pi2 +build_qtbase pi3 -if [ ! -f "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi3.tar.gz" ]; then - echo "Building QT Base for Pi 3" - mkdir -p $QT_PI_3 - cd "$QT_PI_3" +if [ ! -f "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi4.tar.gz" ]; then + echo "Building QT Base for Pi 4" + SRC_DIR="/src/pi4" + mkdir -p "$SRC_DIR" + cd "$SRC_DIR" git clone git://code.qt.io/qt/qtbase.git -b "$QT_BRANCH" cd qtbase ./configure \ -release \ - -opengl es2 \ - -device linux-rasp-pi3-g++ \ + -no-compile-examples \ + -device linux-rasp-pi4-v3d-g++ \ -device-option CROSS_COMPILE=/usr/bin/ \ -opensource \ -confirm-license \ -release \ -make libs \ -prefix /usr/local/qt5pi \ - -extprefix "$QT_PI_3/qt5pi" \ + -extprefix "$SRC_DIR/qt5pi" \ -no-use-gold-linker make -j "$(nproc --all)" make install - cp -r /usr/share/fonts/truetype/dejavu/ "$QT_PI_3/qt5pi/lib/fonts" - cd "$QT_PI_3" - tar -zcvf "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi3.tar.gz" qt5pi + cp -r /usr/share/fonts/truetype/dejavu/ "$SRC_DIR/qt5pi/lib/fonts" + cd "$SRC_DIR" + tar -zcvf "$BUILD_TARGET/qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi4.tar.gz" qt5pi cd "$BUILD_TARGET" - sha256sum "qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi3.tar.gz" > "qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi3.tar.gz.sha256" + sha256sum "qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi4.tar.gz" > "qtbase-$QT_BRANCH-$DEBIAN_VERSION-pi4.tar.gz.sha256" fi From a6b74dbbb1c94b7ce7742297e2e54034729e8d4b Mon Sep 17 00:00:00 2001 From: Emyll Almonte Date: Tue, 24 Nov 2020 23:30:24 -0500 Subject: [PATCH 127/224] Update README.md --- webview/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webview/README.md b/webview/README.md index cd6faaef9..4882d44c2 100644 --- a/webview/README.md +++ b/webview/README.md @@ -1,6 +1,6 @@ -## Building BQ Base +## Building QT Base -Because the QT shiipped with Raspbian doens't come with all dependencies, we need to ship a separate version with the WebView. +Because the QT package shipped with Raspbian doens't come with all dependencies, we need to ship a separate version with the WebView. At the moment, this build will not work with cross-compiling, and needs to be done on a Raspberry Pi. From 447a24c0a92b5364ab9bf4f2b454fefb28578cd7 Mon Sep 17 00:00:00 2001 From: Emyll Almonte Date: Wed, 25 Nov 2020 00:56:14 -0500 Subject: [PATCH 128/224] Update access_denied.html minor fixes for html and font-family + uploading web open font type format (woff) fonts --- webview/res/access_denied.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/webview/res/access_denied.html b/webview/res/access_denied.html index 1de6de3af..fa7183914 100755 --- a/webview/res/access_denied.html +++ b/webview/res/access_denied.html @@ -1,11 +1,15 @@ - + + + Access denied