almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Allow fedora to use either docker or docker-ce

Browse source
This commit is contained in:
Micah Lee 2020-03-16 17:02:07 -07:00
parent 4d6de4f077
commit d62995366f
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.circleci/config.yml
View file

@ -105,7 +105,7 @@ jobs:
- run:
name: Install dependencies
command: |
dnf install -y git openssh ruby-devel make automake gcc gcc-c++ rpm-build qt5-devel python3-qt5 python3-appdirs python3-click python3-pyxdg python3-requests
dnf install -y git openssh ruby-devel make automake gcc gcc-c++ rpm-build qt5-devel python3-qt5 python3-appdirs python3-click python3-pyxdg python3-requests docker
gem install package_cloud
- checkout
- run:
@ -127,7 +127,7 @@ jobs:
- run:
name: Install dependencies
command: |
dnf install -y git openssh ruby-devel make automake gcc gcc-c++ rpm-build qt5-devel python3-qt5 python3-appdirs python3-click python3-pyxdg python3-requests
dnf install -y git openssh ruby-devel make automake gcc gcc-c++ rpm-build qt5-devel python3-qt5 python3-appdirs python3-click python3-pyxdg python3-requests docker
gem install package_cloud
- checkout
- run:

8
BUILD.md
View file

@ -5,9 +5,11 @@
Install dependencies:
```sh
sudo apt install -y python-all dh-python python3-stdeb docker.io python3 python3-pyqt5 python3-appdirs python3-click python3-xdg python3-requests
sudo apt install -y python-all dh-python python3-stdeb python3 python3-pyqt5 python3-appdirs python3-click python3-xdg python3-requests
```
You also need docker, either by installing the `docker.io` package, or by installing `docker-ce` by following [these instructions for Ubuntu](https://docs.docker.com/install/linux/docker-ce/ubuntu/) or [for Debian](https://docs.docker.com/install/linux/docker-ce/debian/).
Run from source tree:
```sh
@ -25,9 +27,11 @@ Create a .deb:
Install dependencies:
```sh
sudo dnf install -y rpm-build python3 python3-qt5 python3-appdirs python3-click python3-pyxdg python3-requests podman
sudo dnf install -y rpm-build python3 python3-qt5 python3-appdirs python3-click python3-pyxdg python3-requests
```
You also need docker, either by installing the `docker` package, or by installing `docker-ce` by following [these instructions](https://docs.docker.com/install/linux/docker-ce/fedora/).
Run from source tree:
```sh

2
install/linux/build_rpm.py
View file

@ -39,7 +39,7 @@ def main():
"python3",
"setup.py",
"bdist_rpm",
"--requires=python3-qt5,python3-appdirs,python3-click,python3-pyxdg,python3-requests,podman",
'--requires="python3-qt5,python3-appdirs,python3-click,python3-pyxdg,python3-requests,(docker or docker-ce)"',
]
)