Merge pull request 'moving to trixie' (#44) from work into main

Reviewed-on: #44

Dockerfile

@@ -1,19 +1,9 @@
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 #
-RUN apt update && apt install cron apache2 python3 python3-pip php libapache2-mod-php  -y
+COPY requirements.txt crontab init.sh /
-RUN a2enmod php*
-COPY crontab /crontab
 COPY refresh.php /var/www/html/
+RUN apt update && apt install cron apache2 python3 python3-pip php libapache2-mod-php  -y && pip3 install -r /requirements.txt --break-system-packages && apt clean && a2enmod php* && chmod +x /init.sh && mkdir /var/www/.aws
 COPY libnotices.py /usr/local/bin/
-COPY requirements.txt /
+RUN chmod +x /usr/local/bin/libnotices.py && chown www-data:www-data /var/www -R && crontab -u www-data /crontab
-COPY init.sh /
-RUN chmod +x /init.sh
-RUN pip3 install -r /requirements.txt
-RUN mkdir /var/www/.aws
-RUN chmod +x /usr/local/bin/libnotices.py
-RUN chown www-data:www-data /var/www -R
-RUN crontab -u www-data /crontab
-RUN apt clean
 EXPOSE 80
-CMD ["/init.sh"]
+CMD ["/init.sh"]
-#(cron -l 8 & ) && su - www-data -s /usr/local/bin/libnotices.py & apache2ctl -D FOREGROUND]

libnotices.py

@@ -140,7 +140,8 @@ for myaccount in accounts:
                 myisbn = mybook['resource']['coverUrl']['small'].split('=')[1].split("/")[0]
             except:
                 myisbn=''
-                if re.match("*ILL",mybook['resource']['title']):
+            if myisbn=='':
+                if re.match(".*ILL",mybook['resource']['title']):
                     isill=True
             try:
                 mycoverurl = mybook['resource']['coverUrl']['small']