From 83895e3689a085c31728f7f24fd185e8a0ceafbe Mon Sep 17 00:00:00 2001 From: samerbam Date: Tue, 6 Jun 2023 14:24:29 -0400 Subject: [PATCH] updated --- Dockerfile | 33 +- release-versions/.DS_Store | Bin 0 -> 6148 bytes release-versions/calibre.txt | 1 - release-versions/fff.txt | 1 - release-versions/latest.txt | 2 +- root/app/fanficdownload.py | 447 ----- root/app/notifications.py | 8 - root/app/runner_notify.py | 304 ++-- root/config.default/config.ini | 19 +- root/config.default/defaults.ini | 2372 ------------------------- root/config.default/fanfiction_file | 25 + root/config.default/personal.ini | 140 -- root/etc/cont-init.d/05-default-confs | 30 +- root/etc/cont-init.d/99-init.d-finish | 2 +- root/etc/services.d/ffdl/run | 4 +- 15 files changed, 219 insertions(+), 3169 deletions(-) create mode 100644 release-versions/.DS_Store delete mode 100644 release-versions/calibre.txt delete mode 100644 release-versions/fff.txt delete mode 100644 root/app/fanficdownload.py delete mode 100644 root/app/notifications.py delete mode 100644 root/config.default/defaults.ini delete mode 100644 root/config.default/personal.ini diff --git a/Dockerfile b/Dockerfile index 5d5fe8d..d83b47d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,7 @@ FROM python:3.9-slim # set version label ARG VERSION -ARG CALIBRE_RELEASE -ARG FFF_RELEASE -LABEL build_version="FFDL-Auto version:- ${VERSION} Calibre: ${CALIBRE_RELEASE} FFF: ${FFF_RELEASE}" +LABEL build_version="FFFRssLinkGrabber version:- ${VERSION}" ENV PUID="911" \ PGID="911" @@ -33,10 +31,10 @@ RUN set -x && \ --shell /bin/bash \ abc -RUN echo "**** install calibre ****" && \ - set -x && \ - apt-get install -y calibre && \ - dbus-uuidgen > /etc/machine-id +#RUN echo "**** install calibre ****" && \ +# set -x && \ +# apt-get install -y calibre && \ +# dbus-uuidgen > /etc/machine-id RUN echo "**** s6 omsta;; ****" && \ @@ -54,16 +52,17 @@ RUN echo "**** s6 omsta;; ****" && \ tar -xzf /tmp/${s6_package} -C / RUN echo *** Install Packages *** && \ - set -x && \ - if [ -z ${FFF_RELEASE} ]; then \ - echo "FFF Using Default Release"; \ - python3 -m pip --no-cache-dir install FanFicFare; \ - else \ - echo "FF Using ${FFF_RELEASE} Release"; \ - python3 -m pip --no-cache-dir install --extra-index-url https://testpypi.python.org/pypi FanFicFare==${FFF_RELEASE}; \ - fi && \ - python3 -m pip --no-cache-dir install pushbullet.py pillow && \ - ln -s /opt/calibre/calibredb /bin/calibredb + #set -x && \ + #if [ -z ${FFF_RELEASE} ]; then \ + # echo "FFF Using Default Release"; \ + # python3 -m pip --no-cache-dir install FanFicFare; \ + #else \ + # echo "FF Using ${FFF_RELEASE} Release"; \ + # python3 -m pip --no-cache-dir install --extra-index-url https://testpypi.python.org/pypi FanFicFare==${FFF_RELEASE}; \ + #fi && \ + #python3 -m pip --no-cache-dir install pushbullet.py pillow && \ + python3 -m pip --no-cache-dir install feedparser && \ + #ln -s /opt/calibre/calibredb /bin/calibredb RUN echo "**** cleanup ****" && \ rm -rf \ diff --git a/release-versions/.DS_Store b/release-versions/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0_label: