From 07c9cdb4c5e2978d0c461bc1b6eeccceab5b9653 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 15 Feb 2023 15:05:00 +0000 Subject: [PATCH] Deprecate image --- Dockerfile | 76 ++-------------------------------------------- Dockerfile.aarch64 | 76 ++-------------------------------------------- Dockerfile.armhf | 76 ++-------------------------------------------- readme-vars.yml | 10 +++++- 4 files changed, 15 insertions(+), 223 deletions(-) diff --git a/Dockerfile b/Dockerfile index 725b610..4f6c0ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + FROM ghcr.io/linuxserver/baseimage-ubuntu:focal # set version label @@ -7,80 +9,6 @@ ARG PAPERMERGE_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="alex-phillips" -# ensures our console output looks familiar and is not buffered by Docker -ENV PYTHONUNBUFFERED 1 -ENV DJANGO_SETTINGS_MODULE config.settings.production -ARG DEBIAN_FRONTEND="noninteractive" - -# NOTE: the additional lib and python dependencies are for the ARM builds -ARG BUILD_PACKAGES="\ - apache2-dev \ - build-essential \ - git \ - libffi-dev \ - libpq-dev \ - libmariadbclient-dev \ - libxml2-dev \ - libxslt-dev \ - python3-dev \ - python3-pip" - -# packages as variables -ARG RUNTIME_PACKAGES="\ - imagemagick \ - libmariadb3 \ - libpq5 \ - libxslt1.1 \ - poppler-utils \ - python3 \ - python3-cryptography \ - python3-distutils \ - python3-mysqldb \ - python3-psycopg2 \ - python3-setuptools \ - redis \ - tesseract-ocr \ - tesseract-ocr-eng \ - uwsgi \ - uwsgi-plugin-python3" - -RUN \ - apt-get update && \ - echo "**** install build packages ****" && \ - apt-get install -y \ - --no-install-recommends \ - $BUILD_PACKAGES && \ - echo "**** install runtime packages ****" && \ - apt-get install -y \ - --no-install-recommends \ - $RUNTIME_PACKAGES && \ - echo "**** install papermerge ****" && \ - mkdir -p /app/papermerge && \ - if [ -z ${PAPERMERGE_RELEASE+x} ]; then \ - PAPERMERGE_RELEASE=$(curl -sX GET "https://api.github.com/repos/ciur/papermerge/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/papermerge.tar.gz -L \ - "https://github.com/ciur/papermerge/archive/${PAPERMERGE_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/papermerge.tar.gz -C \ - /app/papermerge/ --strip-components=1 && \ - echo "**** install pip packages ****" && \ - cd /app/papermerge && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ django==3.1.7 && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r ./requirements/base.txt && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r ./requirements/production.txt && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r ./requirements/extra/mysql.txt && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r ./requirements/extra/pg.txt && \ - echo "**** cleanup ****" && \ - apt-get purge -y --auto-remove \ - $BUILD_PACKAGES && \ - rm -rf \ - /root/.cache \ - /tmp/* && \ - apt-get clean -y - # copy local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 78bf1f9..81f8043 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal # set version label @@ -7,80 +9,6 @@ ARG PAPERMERGE_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="alex-phillips" -# ensures our console output looks familiar and is not buffered by Docker -ENV PYTHONUNBUFFERED 1 -ENV DJANGO_SETTINGS_MODULE config.settings.production -ARG DEBIAN_FRONTEND="noninteractive" - -# NOTE: the additional lib and python dependencies are for the ARM builds -ARG BUILD_PACKAGES="\ - apache2-dev \ - build-essential \ - git \ - libffi-dev \ - libpq-dev \ - libmariadbclient-dev \ - libxml2-dev \ - libxslt-dev \ - python3-dev \ - python3-pip" - -# packages as variables -ARG RUNTIME_PACKAGES="\ - imagemagick \ - libmariadb3 \ - libpq5 \ - libxslt1.1 \ - poppler-utils \ - python3 \ - python3-cryptography \ - python3-distutils \ - python3-mysqldb \ - python3-psycopg2 \ - python3-setuptools \ - redis \ - tesseract-ocr \ - tesseract-ocr-eng \ - uwsgi \ - uwsgi-plugin-python3" - -RUN \ - apt-get update && \ - echo "**** install build packages ****" && \ - apt-get install -y \ - --no-install-recommends \ - $BUILD_PACKAGES && \ - echo "**** install runtime packages ****" && \ - apt-get install -y \ - --no-install-recommends \ - $RUNTIME_PACKAGES && \ - echo "**** install papermerge ****" && \ - mkdir -p /app/papermerge && \ - if [ -z ${PAPERMERGE_RELEASE+x} ]; then \ - PAPERMERGE_RELEASE=$(curl -sX GET "https://api.github.com/repos/ciur/papermerge/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/papermerge.tar.gz -L \ - "https://github.com/ciur/papermerge/archive/${PAPERMERGE_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/papermerge.tar.gz -C \ - /app/papermerge/ --strip-components=1 && \ - echo "**** install pip packages ****" && \ - cd /app/papermerge && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ django==3.1.7 && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r ./requirements/base.txt && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r ./requirements/production.txt && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r ./requirements/extra/mysql.txt && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r ./requirements/extra/pg.txt && \ - echo "**** cleanup ****" && \ - apt-get purge -y --auto-remove \ - $BUILD_PACKAGES && \ - rm -rf \ - /root/.cache \ - /tmp/* && \ - apt-get clean -y - # copy local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7150d9b..bc230b0 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal # set version label @@ -7,80 +9,6 @@ ARG PAPERMERGE_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="alex-phillips" -# ensures our console output looks familiar and is not buffered by Docker -ENV PYTHONUNBUFFERED 1 -ENV DJANGO_SETTINGS_MODULE config.settings.production -ARG DEBIAN_FRONTEND="noninteractive" - -# NOTE: the additional lib and python dependencies are for the ARM builds -ARG BUILD_PACKAGES="\ - apache2-dev \ - build-essential \ - git \ - libffi-dev \ - libpq-dev \ - libmariadbclient-dev \ - libxml2-dev \ - libxslt-dev \ - python3-dev \ - python3-pip" - -# packages as variables -ARG RUNTIME_PACKAGES="\ - imagemagick \ - libmariadb3 \ - libpq5 \ - libxslt1.1 \ - poppler-utils \ - python3 \ - python3-cryptography \ - python3-distutils \ - python3-mysqldb \ - python3-psycopg2 \ - python3-setuptools \ - redis \ - tesseract-ocr \ - tesseract-ocr-eng \ - uwsgi \ - uwsgi-plugin-python3" - -RUN \ - apt-get update && \ - echo "**** install build packages ****" && \ - apt-get install -y \ - --no-install-recommends \ - $BUILD_PACKAGES && \ - echo "**** install runtime packages ****" && \ - apt-get install -y \ - --no-install-recommends \ - $RUNTIME_PACKAGES && \ - echo "**** install papermerge ****" && \ - mkdir -p /app/papermerge && \ - if [ -z ${PAPERMERGE_RELEASE+x} ]; then \ - PAPERMERGE_RELEASE=$(curl -sX GET "https://api.github.com/repos/ciur/papermerge/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/papermerge.tar.gz -L \ - "https://github.com/ciur/papermerge/archive/${PAPERMERGE_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/papermerge.tar.gz -C \ - /app/papermerge/ --strip-components=1 && \ - echo "**** install pip packages ****" && \ - cd /app/papermerge && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ django==3.1.7 && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r ./requirements/base.txt && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r ./requirements/production.txt && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r ./requirements/extra/mysql.txt && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r ./requirements/extra/pg.txt && \ - echo "**** cleanup ****" && \ - apt-get purge -y --auto-remove \ - $BUILD_PACKAGES && \ - rm -rf \ - /root/.cache \ - /tmp/* && \ - apt-get clean -y - # copy local files COPY root/ / diff --git a/readme-vars.yml b/readme-vars.yml index 9f93edd..3e78245 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -6,9 +6,15 @@ project_url: "https://www.papermerge.com/" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/papermerge-icon.png" project_blurb: | [{{ project_name|capitalize }}]({{ project_url }}) is an open source document management system (DMS) primarily designed for archiving and retrieving your digital documents. Instead of having piles of paper documents all over your desk, office or drawers - you can quickly scan them and configure your scanner to directly upload to Papermerge DMS." - project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" +project_deprecation_status: true +project_deprecation_message: | + The last working tag is: + v2.0.1-ls60 + We recommend the official image instead: + https://hub.docker.com/r/papermerge/papermerge + # supported architectures available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} @@ -43,8 +49,10 @@ app_setup_block: | More info at [papermerge]({{ project_url }}). If you need non-English OCR language support, you can use [this mod](https://github.com/linuxserver/docker-mods/tree/papermerge-multilangocr). + # changelog changelogs: + - { date: "15.02.23:", desc: "Deprecate image." } - { date: "15.07.22:", desc: "Don't install development python packages" } - { date: "13.04.21:", desc: "Handle upstream stapler change" } - { date: "13.03.21:", desc: "Fixed mglib dependency per issue 32"}