Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Finally merges Experimental into Master #1453

Merged
merged 281 commits into from
Dec 19, 2020
Merged

Finally merges Experimental into Master #1453

merged 281 commits into from
Dec 19, 2020

Conversation

vpetersson
Copy link
Contributor

This is a ginormous PR. Here is a selection of the changes:

  • Migrates all workloads into Docker
  • Consolidates Balena and non-Balena runtime (with docker-compose override file as the difference)
  • Moves to use QT and QTWebEngine for image and web page playback (to improve web performance and support)
  • Adds support for Raspberry Pi 4 Model B
  • Adds build scripts for QT

Known issues

  • Websocket appears to not work
  • The WiFi hotspot has been explicitly disabled
  • ...probably a lot more that we'll discover in the coming days or weeks

ealmonte32 and others added 30 commits January 14, 2020 13:16
@ealmonte32
Update install.sh
21269ed 
adding autoremove and version.md file creation for screenly details..
@vpetersson
Merge pull request #1290 from ealmonte32/patch-5
46be3ce 
Update install.sh
@rusko124
Merge branch 'master' into webkit_instead_uzbl
f53d596
@ealmonte32
Update main.yml
52e5323 
updating due to ansible deprecation with loop and {{ items }}
@vpetersson
Merge pull request #1322 from ealmonte32/patch-12
5495372 
Update main.yml
@ealmonte32
Update main.yml
5f3f0e7
@ealmonte32
Update main.yml
b81b4aa
@ealmonte32
Update main.yml
a9eb810
@ealmonte32
Update main.yml
3ed526f
@vpetersson
Merge pull request #1391 from ealmonte32/patch-10
9c84f22 
Update main.yml
@vpetersson
Merge pull request #1392 from ealmonte32/patch-11
0f6fd28 
Update main.yml
@vpetersson
Merge pull request #1394 from ealmonte32/patch-19
26a6b47 
minor deprecation fix on Jessie block - experimental branch
@rusko124
Merge branch 'master' into webkit_instead_uzbl
bbeb50d
@rusko124
Merge branch 'webkit_instead_uzbl' of https://github.com/rusko124/scr…
79184ff 
…eenly-ose into webkit_instead_uzbl
@rusko124
Merge branch 'webkit_instead_uzbl' into edits/merge-master-into-exper…
2f0f6ba 
…imental
@rusko124
Edits: ansible tasks and travis.yml
66894eb
@rusko124
Fix: ansible screenly role
b77e7da
@rusko124
Fix for successfull running
ab91057
@rusko124
Edits: docker-compose in the ansible task
e3e6911
@rusko124
Fix: ansible tasks
4548587
@rusko124
Fix: images pull location
ebba512
@vpetersson
Merge pull request #1407 from rusko124/edits/merge-master-into-experi…
5df2a6d 
…mental

Edits: merge the master branch into the experimental branch
@vpetersson
Fixes group
8d3aa71
@rusko124
Edits: build images locally
a9a499b
@rusko124
Edits after review
654ff9d
@vpetersson
Merge pull request #1408 from rusko124/edits/build-images-locally
ccbe012 
Edits: build images locally
@vpetersson
Ansible/Docker fixes
66379bf
@vpetersson
Add explicit pull policy
e16ff5b
@vpetersson
Fixes docker reference
a400699
@vpetersson
More expriments with docker-compose module
9b546f2
rusko124 and others added 28 commits December 18, 2020 17:33
@rusko124
Edits: vlc player instead of omxplayer
7816ac5
@rusko124
Edits: after review
be9749f
@vpetersson
Merge pull request #1448 from rusko124/edits/experimental-videoplayer
7191b31 
Edits: vlc player instead of omxplayer
@rusko124
Fix: hardcode listen host for the local files
d859ee9
@vpetersson
Merge pull request #1449 from rusko124/fix/hardcode-host-for-local-as…
8d24dfb 
…sets

Fix: hardcode listen host for the local files
@vpetersson
Fixes broken logic in script
d64370c
@vpetersson
Fixes new path
d9eebf0
@vpetersson
Fixes URL
7a2e8a9
@rusko124
Edits: removed includes
f8b81f8
@vpetersson
Merge pull request #1450 from rusko124/fix/hardcode-host-for-local-as…
906f47b 
…sets

Edits: removed includes
@vpetersson
Fixes various bind/connect issues between services
370feb7
@vpetersson
Merge branch 'experimental' of github.com:Screenly/screenly-ose into …
adc91d9 
…experimental
@rusko124
Edits: logs for the viewer
822fa2d
@vpetersson
Merge pull request #1451 from rusko124/fix/hardcode-host-for-local-as…
ec92c35 
…sets

Edits: logs for the viewer
@vpetersson
Fixes caching issue
dff75c1
@vpetersson
Merge branch 'experimental' of github.com:Screenly/screenly-ose into …
aed2803 
…experimental
@vpetersson
Adds websocket annotation to nginx
e42b024
@vpetersson
More caching related fixes
5495f62
@vpetersson
Minor bash best practice tweak
349cbe4
@vpetersson
Revises build process for webview. Adds hash and volume mount
6358ac6
@vpetersson
Adds git hash to viewer
a9b69c9
@vpetersson
Merge branch 'experimental' of github.com:Screenly/screenly-ose into …
2ef8165 
…experimental
@vpetersson
Temporary workaround for watchdog
369389b
@vpetersson
Sudoers fix on pi4
01931f7
@rusko124
Edits: debug webview only if WEBVIEW_DEBUG passed
761ac72
@vpetersson
Merge pull request #1452 from rusko124/edits/webview-debug-if-env
2612986 
Edits: debug webview only if WEBVIEW_DEBUG passed
@vpetersson
Fixes sudo permission on pi4
6d1b102
@vpetersson
Merge branch 'experimental' of github.com:Screenly/screenly-ose into …
bba52dc 
…experimental
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot E 2 Security Hotspots
Code Smell A 9 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@vpetersson vpetersson merged commit 8927379 into master Dec 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@vpetersson @HendryLeo @ealmonte32 @rusko124 @shawaj