Merge branch 'master' into 39_docker_group

This commit is contained in:
Micah Lee 2020-03-16 11:32:56 -07:00
commit 171fda8017
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
2 changed files with 3 additions and 3 deletions

View file

@ -1,3 +1,3 @@
#!/bin/sh
/usr/bin/systemctl restart docker
/usr/bin/systemctl enable docker
/usr/bin/systemctl restart docker.service
/usr/bin/systemctl enable docker.service

View file

@ -1,6 +1,6 @@
[DEFAULT]
Package3: dangerzone
Depends3: docker.io, python3, python3-pyqt5, python3-appdirs, python3-click, python3-xdg, python3-requests
Depends3: docker.io | docker-ce, python3, python3-pyqt5, python3-appdirs, python3-click, python3-xdg, python3-requests
Build-Depends: python3, python3-all
Suite: bionic
X-Python3-Version: >= 3.7