From d50b0c1bedcd8159ed2d47ea6b0bb952bb62d4fa Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Thu, 17 Jun 2021 14:12:44 -0700 Subject: [PATCH] Remove docker dependency in Linux and replace with podman --- .circleci/config.yml | 67 -------------------------------------- BUILD.md | 8 ++--- install/linux/build_rpm.py | 2 +- stdeb.cfg | 2 +- 4 files changed, 4 insertions(+), 75 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b99a22f..80f3b3a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -81,37 +81,6 @@ jobs: package_cloud push firstlookmedia/code/ubuntu/groovy deb_dist/dangerzone_${VERSION}-1_all.deb package_cloud push firstlookmedia/code/ubuntu/groovy deb_dist/dangerzone_${VERSION}-1.dsc - build-ubuntu-focal: - docker: - - image: ubuntu:20.04 - steps: - - run: - name: Install dependencies - command: | - export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true - apt-get update - apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3 python3-stdeb python3-pyside2.qtcore python3-pyside2.qtgui python3-pyside2.qtwidgets python3-appdirs python3-click python3-xdg python3-requests python3-colorama - gem install -N rake - gem install -N package_cloud - - checkout - - run: - name: Create the .deb package - command: | - ./install/linux/build_deb.py - dpkg -i deb_dist/dangerzone_*-1_all.deb - - run: - name: Deploy to packagecloud.io - # Linux Mint 20 (ulyana) and 20.1 (ulyssa) are based on Ubuntu 20.04 LTS - # https://en.wikipedia.org/wiki/Linux_Mint_version_history - command: | - VERSION=$(cat share/version.txt) - package_cloud push firstlookmedia/code/ubuntu/focal deb_dist/dangerzone_${VERSION}-1_all.deb - package_cloud push firstlookmedia/code/ubuntu/focal deb_dist/dangerzone_${VERSION}-1.dsc - package_cloud push firstlookmedia/code/linuxmint/ulyana deb_dist/dangerzone_${VERSION}-1_all.deb - package_cloud push firstlookmedia/code/linuxmint/ulyana deb_dist/dangerzone_${VERSION}-1.dsc - package_cloud push firstlookmedia/code/linuxmint/ulyssa deb_dist/dangerzone_${VERSION}-1_all.deb - package_cloud push firstlookmedia/code/linuxmint/ulyssa deb_dist/dangerzone_${VERSION}-1.dsc - build-debian-bullseye: docker: - image: debian:bullseye @@ -136,30 +105,6 @@ jobs: package_cloud push firstlookmedia/code/debian/bullseye deb_dist/dangerzone_${VERSION}-1_all.deb package_cloud push firstlookmedia/code/debian/bullseye deb_dist/dangerzone_${VERSION}-1.dsc - build-debian-buster: - docker: - - image: debian:buster - steps: - - run: - name: Install dependencies - command: | - apt-get update - apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3 python3-stdeb python3-pyside2.qtcore python3-pyside2.qtgui python3-pyside2.qtwidgets python3-appdirs python3-click python3-xdg python3-requests python3-colorama - gem install --no-ri --no-rdoc rake - gem install --no-ri --no-rdoc package_cloud - - checkout - - run: - name: Create the .deb package - command: | - ./install/linux/build_deb.py - dpkg -i deb_dist/dangerzone_*-1_all.deb - - run: - name: Deploy to packagecloud.io - command: | - VERSION=$(cat share/version.txt) - package_cloud push firstlookmedia/code/debian/buster deb_dist/dangerzone_${VERSION}-1_all.deb - package_cloud push firstlookmedia/code/debian/buster deb_dist/dangerzone_${VERSION}-1.dsc - build-fedora-34: docker: # The package_cloud ruby gem doesn't work properly when installed in fedora 34, @@ -252,24 +197,12 @@ workflows: only: /^v.*/ branches: ignore: /.*/ - - build-ubuntu-focal: - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/ - build-debian-bullseye: filters: tags: only: /^v.*/ branches: ignore: /.*/ - - build-debian-buster: - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/ - build-fedora-34: filters: tags: diff --git a/BUILD.md b/BUILD.md index b9d40a1..59674c0 100644 --- a/BUILD.md +++ b/BUILD.md @@ -5,11 +5,9 @@ Install dependencies: ```sh -sudo apt install -y dh-python python3 python3-stdeb python3-pyside2.qtcore python3-pyside2.qtgui python3-pyside2.qtwidgets python3-appdirs python3-click python3-xdg python3-requests python3-colorama +sudo apt install -y podman dh-python python3 python3-stdeb python3-pyside2.qtcore python3-pyside2.qtgui python3-pyside2.qtwidgets python3-appdirs python3-click python3-xdg python3-requests python3-colorama ``` -You also need docker, either by installing the [Docker snap package](https://snapcraft.io/docker), 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 @@ -27,11 +25,9 @@ Create a .deb: Install dependencies: ```sh -sudo dnf install -y rpm-build python3 python3-setuptools python3-pyside2 python3-appdirs python3-click python3-pyxdg python3-requests python3-colorama +sudo dnf install -y rpm-build podman python3 python3-setuptools python3-pyside2 python3-appdirs python3-click python3-pyxdg python3-requests python3-colorama ``` -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 7c6300d..2f07c60 100755 --- a/install/linux/build_rpm.py +++ b/install/linux/build_rpm.py @@ -29,7 +29,7 @@ def main(): print("* Building RPM package") subprocess.run( - "python3 setup.py bdist_rpm --requires='python3-pyside2,python3-appdirs,python3-click,python3-pyxdg,python3-requests,python3-colorama,(docker or docker-ce)'", + "python3 setup.py bdist_rpm --requires='podman,python3-pyside2,python3-appdirs,python3-click,python3-pyxdg,python3-requests,python3-colorama'", shell=True, cwd=root, check=True, diff --git a/stdeb.cfg b/stdeb.cfg index df13e23..519d82b 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,6 +1,6 @@ [DEFAULT] Package3: dangerzone -Depends3: python3, python3-pyside2.qtcore, python3-pyside2.qtgui, python3-pyside2.qtwidgets, python3-appdirs, python3-click, python3-xdg, python3-requests, python3-colorama +Depends3: podman, python3, python3-pyside2.qtcore, python3-pyside2.qtgui, python3-pyside2.qtwidgets, python3-appdirs, python3-click, python3-xdg, python3-requests, python3-colorama Build-Depends: dh-python, python3, python3-all Suite: bionic X-Python3-Version: >= 3.6 \ No newline at end of file