Overhauled Linux build environment

3 files changed, 2 insertions, 29 deletions

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 361fb8a..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Recipe used to build DEB package
-
-FROM acidweb/kcc-base
-MAINTAINER Paweł Jastrzębski <pawelj@iosphe.re>
-
-ENV KCCVER 5.0.1
-ADD . /app
-
-RUN pip3 install pillow python-slugify psutil scandir pyinstaller
-RUN gem install fpm
-RUN useradd -ms /bin/bash kcc && chown -R kcc:kcc /app
-
-USER kcc
-WORKDIR /app
-RUN pyinstaller -F -s --noupx kcc.py
-RUN mkdir -p dist/usr/bin dist/usr/share/applications dist/usr/share/doc/kindlecomicconverter dist/usr/share/kindlecomicconverter dist/usr/share/lintian/overrides
-RUN mv dist/kcc dist/usr/bin
-RUN cp icons/comic2ebook.png dist/usr/share/kindlecomicconverter
-RUN cp LICENSE.txt dist/usr/share/doc/kindlecomicconverter/copyright
-RUN cp other/linux/kindlecomicconverter.desktop dist/usr/share/applications
-RUN cp other/linux/kindlecomicconverter dist/usr/share/lintian/overrides
-
-WORKDIR /app/dist
-RUN fpm -f -s dir -t deb -n kindlecomicconverter -v $KCCVER -m "Paweł Jastrzębski <pawelj@iosphe.re>" --license "ISC" --description "Comic and Manga converter for e-book readers.\nThis app allows you to transform your PNG, JPG, GIF, CBZ, CBR and CB7 files\ninto EPUB or MOBI format e-books." --url "https://kcc.iosphe.re/" --deb-priority "optional" --vendor "" --category "graphics" -d "unrar | unrar-free" -d "p7zip-full" usr
-
-CMD mkdir -p /out/dist && cp kindlecomicconverter_${KCCVER}_amd64.deb /out/dist
diff --git a/other/linux/kindlecomicconverter b/other/linux/kindlecomicconverter
index 5b9b428..c9baf04 100644
--- a/other/linux/kindlecomicconverter
+++ b/other/linux/kindlecomicconverter
@@ -1,4 +1,4 @@
-kindlecomicconverter: statically-linked-binary usr/bin/kcc
 kindlecomicconverter: binary-without-manpage usr/bin/kcc
 kindlecomicconverter: wrong-name-for-changelog-of-native-package usr/share/doc/kindlecomicconverter/changelog.Debian.gz
 kindlecomicconverter: file-missing-in-md5sums usr/share/doc/kindlecomicconverter/changelog.Debian.gz
+kindlecomicconverter: hardening-no-relro usr/bin/kcc
diff --git a/setup.py b/setup.py
index 35c6dce..e6d68c8 100755
--- a/setup.py
+++ b/setup.py
@@ -90,8 +90,7 @@ class BuildBinaryCommand(distutils.cmd.Command):
                 os.system("bash -c '%s'" % script)
                 exit(0)
             else:
-                os.system('docker build --no-cache -t kcc . && docker run --rm -v ' + os.getcwd() +
-                          ':/out kcc && docker rmi kcc')
+                os.system('docker run --rm -v ' + os.getcwd() + ':/app -e KCCVER=' + VERSION + ' acidweb/kcc')
                 exit(0)