diff --git a/.circleci/config.yml b/.circleci/config.yml index d1a99cf..a463ac1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: diff --git a/BUILD.md b/BUILD.md index 6377d1b..ddae5b2 100644 --- a/BUILD.md +++ b/BUILD.md @@ -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 diff --git a/install/linux/build_rpm.py b/install/linux/build_rpm.py index b73c12b..2f1fa3e 100755 --- a/install/linux/build_rpm.py +++ b/install/linux/build_rpm.py @@ -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)"', ] )