packaging: Pin dockerfile distro versions and fix installations

- Remove unrar since its not in debian (only in non-free)
- Use 7zip instead of p7zip, and executable 7zz instead of 7za

README.md

@@ -26,7 +26,7 @@ Then to run:
 
 ## Tools
 
-File types(101) | Tools(58)
+File types(100) | Tools(57)
 ----------:| -----
 .* | [contents](http://pygments.org/) • [metadata](https://github.com/ahamilton/eris) • [git_diff](https://git-scm.com/docs/git-diff) • [git_blame](https://git-scm.com/docs/git-blame) • [git_log](https://git-scm.com/docs/git-log)
 .py | [python_syntax](https://en.wikipedia.org/wiki/Python_syntax_and_semantics) • [python_unittests](https://docs.python.org/3/library/unittest.html) • [pytest](https://docs.pytest.org/en/latest/) • [pydoc](https://docs.python.org/3/library/pydoc.html) • [mypy](http://mypy-lang.org/) • [python_coverage](https://coverage.readthedocs.io/) • [pycodestyle](http://pycodestyle.pycqa.org/en/latest/) • [pydocstyle](http://www.pydocstyle.org/en/2.1.1/usage.html) • [pyflakes](https://pypi.org/project/pyflakes/) • [pylint](https://www.pylint.org/) • [python_gut](https://github.com/ahamilton/eris) • [python_mccabe](https://pypi.org/project/mccabe/) • [bandit](https://pypi.org/project/bandit/)
@@ -49,7 +49,6 @@ File types(101) | Tools(58)
 .zip .jar .apk .egg .whl | [zipinfo](http://www.info-zip.org/UnZip.html)
 .tar.gz .tgz | [tar_gz](http://www.gnu.org/software/tar/manual/tar.html)
 .tar.bz2 | [tar_bz2](http://www.gnu.org/software/tar/manual/tar.html)
-.rar | [unrar](http://www.rarlabs.com/)
 .7z | [7z](http://p7zip.sourceforge.net/)
 .xz | [unxz](https://tukaani.org/xz/)
 .a | [ar](https://en.wikipedia.org/wiki/Ar_(Unix)) • [nm](https://linux.die.net/man/1/nm)

eris/eris/__main__.py

@@ -1139,6 +1139,7 @@ def install_all_tools():
         tools_.remove("rakudo")
         tools_.remove("python3-pdfminer")  # pdf2txt is not in arch
         tools_.remove("perl-doc")  # perldoc is in perl but not in the path
+        tools_.remove("7zip")
         renames = {"genisoimage": "cdrkit", "lua5.3": "lua", "ruby3.1": "ruby", "xz-utils": "xz",
                    "g++": "gcc", "golang-go": "go", "lua-check": "luacheck", "php-cli": "php",
                    "pylint": "python-pylint", "python3-bandit": "bandit", "python3-mypy": "mypy"}
@@ -1149,7 +1150,6 @@ def install_all_tools():
     elif "ID=alpine\n" in os_release_lines:
         tools_.remove("python3-bandit")
         tools_.remove("wabt")
-        tools_.remove("unrar")
         renames = {"genisoimage": "cdrkit", "lua5.3": "lua", "ruby3.1": "ruby", "xz-utils": "xz",
                    "g++": "gcc", "golang-go": "go", "lua-check": "luacheck", "php-cli": "php",
                    "pylint": "py3-pylint", "tidy": "tidyhtml"}

eris/eris/tools.toml

@@ -24,7 +24,6 @@ tools_for_extensions = [
    [["zip", "jar", "apk", "egg", "whl"], ["zipinfo"]],
    [["tar.gz", "tgz"],["tar_gz"]],
    [["tar.bz2"], ["tar_bz2"]],
-   [["rar"], ["unrar"]],
    [["7z"], ["7z"]],
    [["xz"], ["unxz"]],
    [["a"], ["ar", "nm"]],
@@ -145,15 +144,10 @@ tools_for_extensions = [
   url = "http://www.gnu.org/software/tar/manual/tar.html"
   command = "tar jtvf"
 
-[unrar]
-  dependencies = ["unrar"]
-  url = "http://www.rarlabs.com/"
-  command = "unrar l"
-
 [7z]
-  dependencies = ["p7zip"]
+  dependencies = ["7zip"]
   url = "http://p7zip.sourceforge.net/"
-  command = "7za l"
+  command = "7zz l"
 
 [unxz]
   dependencies = ["xz-utils"]

packaging/Dockerfile.arch

@@ -1,6 +1,6 @@
 
 
-FROM archlinux
+FROM archlinux:base-20240101.0.204074
 
 RUN pacman -Sy
 RUN pacman --noconfirm -S python-pipx gcc python-devtools

packaging/Dockerfile.fedora

@@ -1,6 +1,6 @@
 
 
-FROM fedora
+FROM fedora:38
 
 RUN dnf -y install python3.11 python3-pip pipx gcc python3.11-devel
 COPY . eris

packaging/Dockerfile.ubuntu

@@ -13,4 +13,4 @@ RUN eris --install-all-tools
 ENTRYPOINT ["eris"]
 
 
-# docker build -t eris -f packaging/Dockerfile .
+# docker build -t eris -f packaging/Dockerfile.ubuntu .