Merge pull request #1453 from Screenly/experimental

Finally merges Experimental into Master

.dockerignore

@@ -37,3 +37,5 @@ pip-log.txt
 .sass-cache/*
 node_modules
 venv
+
+docker-compose.*

.github/workflows/docker-build.yaml

@@ -0,0 +1,36 @@
+name: Docker Image Build
+
+on:
+  push:
+    branches:
+      - master
+      - production
+      - experimental
+      - experimental-fixes
+
+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: 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

.gitignore

@@ -36,5 +36,4 @@ pip-log.txt
 venv
 node_modules
 *.retry
-
 .env

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.svg)](https://dashboard.balena-cloud.com/deploy?repoUrl=https://github.com/screenly/screenly-ose&defaultDeviceType=raspberrypi3)
 
 # Screenly OSE - Digital Signage for the Raspberry Pi
 
@@ -9,12 +10,6 @@
 
 Want to help OSE thrive? Support us using [GitHub Sponsor](https://github.com/sponsors/Screenly).
 
-## A note on Raspberry Pi 4 support
-
-Screenly OSE does not currently support the Raspberry Pi 4 Model B (well). We are looking for volunteers to help us with this. The remaining work is tracked [here](https://github.com/Screenly/screenly-ose/milestone/12). In short, we are doing a big overhaul (moving to Docker and QT/QTWebEngine). This will allow us to get things like a modern browser with hardware acceleration, as well as a simpler installation process.
-
-If you got experience with QT, we'd love your help.
-
 ## Disk images
 
 The recommended installation method is to grab the latest disk image from [here](https://github.com/Screenly/screenly-ose/releases).

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 }}"
@@ -70,91 +70,3 @@
   when:
     - ansible_distribution_major_version|int >= 9
     - manage_network|bool == true
-
-- name: Check if resin-wifi-connect required version exist
-  stat:
-    path: "/usr/local/share/wifi-connect/ui/{{ resin_wifi_connect_version }}"
-  register: resin_wifi_version_file
-  when:
-    - ansible_distribution_major_version|int >= 9
-
-- 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
-  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"
-    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
-  unarchive:
-    src: /home/pi/resin-wifi-connect.tar.gz
-    dest: /home/pi
-    owner: pi
-    group: pi
-  when:
-    - ansible_distribution_major_version|int >= 9
-    - not resin_wifi_version_file_exist
-    - manage_network|bool == true
-
-- name: Copy "ui" folder
-  copy:
-    src: /home/pi/ui/
-    dest: /usr/local/share/wifi-connect/ui
-    mode: 0755
-  when:
-    - ansible_distribution_major_version|int >= 9
-    - not resin_wifi_version_file_exist
-    - manage_network|bool == true
-
-- name: Copy wifi-connect file
-  copy:
-    src: /home/pi/wifi-connect
-    dest: /usr/local/sbin
-    mode: 0755
-  when:
-    - ansible_distribution_major_version|int >= 9
-    - not resin_wifi_version_file_exist
-    - manage_network|bool == true
-
-- name: Touch resin-wifi-connect version file
-  file:
-    state: touch
-    path: "/usr/local/share/wifi-connect/ui/{{ resin_wifi_connect_version }}"
-  when:
-    - ansible_distribution_major_version|int >= 9
-    - not resin_wifi_version_file_exist
-    - manage_network|bool == true
-
-- name: Remove unarchive files
-  file:
-    state: absent
-    path: "/home/pi/{{ item }}"
-  with_items:
-    - wifi-connect
-    - ui
-    - resin-wifi-connect.tar.gz
-  when:
-    - ansible_distribution_major_version|int >= 9
-    - not resin_wifi_version_file_exist
-    - manage_network|bool == true
-
-- name: Copy wifi-connect systemd unit
-  copy:
-    src: "wifi-connect.service"
-    dest: "/etc/systemd/system/wifi-connect.service"
-
-- name: Enable wifi-connect systemd service
-  systemd:
-    name: wifi-connect.service
-    enabled: yes
-
-- name: Touch initialized file
-  file:
-    state: touch
-    path: "/home/pi/.screenly/initialized"

ansible/roles/network/vars/main.yml

@@ -1 +1 @@
-resin_wifi_connect_version: 4.2.13
+balena_wifi_connect_version: 4.2.13