From 2d1712dbd205987a30d26b3d272660b858746484 Mon Sep 17 00:00:00 2001
From: Jean-Etienne Castagnede <j.e.castagnede@gmail.com>
Date: Tue, 19 Nov 2024 12:36:52 +0100
Subject: [PATCH] Improvements (#65)

* update changelog

* delete circle ci file

* add specific docker ini file

* fix production ini file

* Update dockerfile to ubuntu noble

* add pip to dependabot checks
---
 .circleci/config.yml   | 113 -----------------------------------------
 .github/dependabot.yml |   4 ++
 CHANGES.rst            |   3 +-
 Dockerfile             |   5 +-
 docker.ini             |  70 +++++++++++++++++++++++++
 production.ini         |   2 +-
 6 files changed, 79 insertions(+), 118 deletions(-)
 delete mode 100644 .circleci/config.yml
 create mode 100644 docker.ini

diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index b7de016..0000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-version: 2.1
-# orbs:
-#   codecov: codecov/codecov@1.0.5
-jobs:
-  codestyle:
-    docker:
-      - image: circleci/python:3.5
-    environment:
-      LANG: C.UTF-8
-    steps:
-      - checkout
-      - run: pip install flake8
-      - run: flake8 convertit
-  test:
-    docker:
-      - image: ubuntu:bionic
-    environment:
-      LANG: C.UTF-8
-    steps:
-      - checkout
-      - run: >
-          apt-get update && apt-get install -y
-          python3-setuptools python3-coverage unoconv
-          zlib1g-dev
-      - run: python3-coverage run setup.py test
-      # - codecov/upload:
-      #     when: on_success
-  build_bionic:
-    docker:
-      - image: ubuntu:bionic
-    environment:
-      LANG: C.UTF-8
-      DEBIAN_FRONTEND: noninteractive
-    steps:
-      - checkout
-      - run: sed -i 's/convertit (\([0-9]\+\.[0-9]\+\.[0-9]\+\)\(.*\)) RELEASED;/convertit (\1.ubuntu18.04\2) bionic;/' debian/changelog
-      - run: apt-get update -q
-      - run: >
-          apt-get update && apt-get install -y
-          dh-virtualenv dpkg-dev debhelper dh-python python3-setuptools python3-all
-          python3-venv
-          unoconv inkscape
-      - run: dpkg-buildpackage -uc -us
-      - persist_to_workspace:
-          root: /root
-          paths: convertit_*_amd64.deb
-  build_focal:
-    docker:
-      - image: ubuntu:focal
-    environment:
-      LANG: C.UTF-8
-      DEBIAN_FRONTEND: noninteractive
-    steps:
-      - checkout
-      - run: sed -i 's/convertit (\([0-9]\+\.[0-9]\+\.[0-9]\+\)\(.*\)) RELEASED;/convertit (\1.ubuntu20.04\2) focal;/' debian/changelog
-      - run: apt-get update -q
-      - run: DEBIAN_FRONTEND=noninteractive apt-get install -q -y software-properties-common
-      - run: add-apt-repository ppa:jyrki-pulliainen/dh-virtualenv
-      - run: >
-          apt-get update && apt-get install -y
-          dh-virtualenv dpkg-dev debhelper dh-python python3-setuptools python3-all
-          python3-venv
-          unoconv inkscape
-      - run: dpkg-buildpackage -uc -us
-      - persist_to_workspace:
-          root: /root
-          paths: convertit_*_amd64.deb
-  publish:
-    docker:
-      - image: ubuntu:bionic
-    environment:
-      LANG: C.UTF-8
-    steps:
-      - checkout
-      - run: apt-get update -q && apt-get install -q -y ca-certificates openssh-client
-      - attach_workspace:
-          at: /tmp/workspace
-      - run:
-          command: |
-            export DEB_COMPONENT=main
-            scp -P $SSH_PORT -o StrictHostKeyChecking=no /tmp/workspace/convertit_*_amd64.deb $SSH_USER@$SSH_HOST:/srv/packages/incoming/$DEB_COMPONENT/
-      - run: ssh -p $SSH_PORT -o StrictHostKeyChecking=no $SSH_USER@$SSH_HOST make -C /srv/packages
-workflows:
-  version: 2
-  all:
-    jobs:
-      - codestyle:
-          filters:
-            tags:
-              only: /[0-9]+\.[0-9]+\.[0-9]+/
-      - test:
-          filters:
-            tags:
-              only: /[0-9]+\.[0-9]+\.[0-9]+/
-      - build_bionic:
-          filters:
-            tags:
-              only: /[0-9]+\.[0-9]+\.[0-9]+/
-      - build_focal:
-          filters:
-            tags:
-              only: /[0-9]+\.[0-9]+\.[0-9]+/
-      - publish:
-          requires:
-            - codestyle
-            - test
-            - build_bionic
-            - build_focal
-          filters:
-            tags:
-              only: /[0-9]+\.[0-9]+\.[0-9]+/
-            branches:
-              ignore: /.*/
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 1b18eec..6a4c5c3 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,4 +9,8 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+  - package-ecosystem: "pip"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
     open-pull-requests-limit: 20
diff --git a/CHANGES.rst b/CHANGES.rst
index b344988..52081c9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,8 +5,9 @@ CHANGELOG
 2.2.6.dev0
 ------------------
 
+- Add Ubuntu 24.04 official support with debian package
 - Add Ubuntu 22.04 official support with debian package
-- Update Docker image to ubuntu 22.04 base
+- Update Docker image to ubuntu 24.04 base
 - Use directly libreoffice instead of deprecated unoconv
 - Move CI to github-action
 - Fix typo in attachment response Content-Disposition (#38)
diff --git a/Dockerfile b/Dockerfile
index 1375fb9..5acdba3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=jammy
+ARG DISTRO=noble
 
 FROM ubuntu:${DISTRO} AS base
 LABEL org.opencontainers.image.authors="Makina Corpus <contact@makina-corpus.com>"
@@ -6,7 +6,6 @@ LABEL org.opencontainers.image.authors="Makina Corpus <contact@makina-corpus.com
 RUN apt-get update && apt-get install -y -qq python3 libreoffice default-jre libreoffice-java-common inkscape python3-magic && \
     apt-get autoclean && apt-get clean all && rm -rf /var/apt/lists/*
 
-
 WORKDIR /opt/apps/convertit
 
 COPY .docker/run.sh /usr/local/bin/run
@@ -37,6 +36,6 @@ COPY convertit /opt/apps/convertit/convertit
 COPY setup.py /opt/apps/convertit/setup.py
 COPY README.rst /opt/apps/convertit/README.rst
 RUN /opt/venv/bin/pip install .
-COPY production.ini /opt/apps/convertit/production.ini
+COPY docker.ini /opt/apps/convertit/production.ini
 VOLUME /var/cache/convertit/downloads
 VOLUME /var/cache/convertit/converted
\ No newline at end of file
diff --git a/docker.ini b/docker.ini
new file mode 100644
index 0000000..8ddac84
--- /dev/null
+++ b/docker.ini
@@ -0,0 +1,70 @@
+[app:main]
+use = egg:convertit
+
+pyramid.reload_templates = false
+pyramid.debug_authorization = false
+pyramid.debug_notfound = false
+pyramid.debug_routematch = false
+pyramid.default_locale_name = en
+
+convertit.downloads_path = /var/cache/convertit/downloads
+convertit.downloads_max_age = 60
+convertit.converted_path = /var/cache/convertit/converted
+convertit.converted_max_age = 60
+# The retrieve url of converted files
+# It can be a full url like http://static.domain.tld/full/path/
+convertit.converted_url = converted
+# Available options:
+#   url_hostname: the url hostname
+#   url_port: the url port
+#   url_dirname: the url path's dirname with '/' replaced by '_'
+#   url_filename: filename part of the url path's basename
+#   url_extension: extension part of the url path's basename
+#   extension: the converted extension
+# Exemple: url=http://exemple.com:8080/path/to/foo.bar&to=application/pdf
+#   url_hostname: exemple.com
+#   url_port: 8080
+#   url_dirname: path_to
+#   url_filename: foo
+#   url_extension: .bar
+#   extension: .pdf
+convertit.converted_name = {url_hostname}_{url_port}_{url_dirname}_{url_filename}{extension}
+convertit.converters =
+    convertit.converters.unoconv
+    convertit.converters.inkscape
+
+[server:main]
+use = egg:gunicorn#main
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, convertit
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+
+[logger_convertit]
+level = WARN
+handlers =
+qualname = convertit
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/production.ini b/production.ini
index 8ddac84..f0a9eee 100644
--- a/production.ini
+++ b/production.ini
@@ -35,7 +35,7 @@ convertit.converters =
 
 [server:main]
 use = egg:gunicorn#main
-host = 0.0.0.0
+host = localhost
 port = 6543
 
 # Begin logging configuration