Skip to content

Commit 05feadb

Browse files
committed
Squashed commit of the following:
commit a4709b1 Author: Michael Shamoon <[email protected]> Date: Thu Jul 28 15:36:13 2022 -0700 Update stale.yml [skip ci] commit 3a03108 Author: Michael Shamoon <[email protected]> Date: Thu Jul 28 15:24:23 2022 -0700 Update changelog.md commit 0c517e5 Author: Michael Shamoon <[email protected]> Date: Thu Jul 28 15:18:49 2022 -0700 v1.8.0 version strings commit 5fe4350 Merge: 278cedf a722bfd Author: shamoon <[email protected]> Date: Thu Jul 28 15:17:30 2022 -0700 Merge pull request #1240 from paperless-ngx/beta [Beta] Paperless-ngx v1.8.0 Release Candidate 1 commit a722bfd Author: Paperless-ngx Translation Bot [bot] <[email protected]> Date: Thu Jul 28 07:46:12 2022 -0700 New Crowdin updates (jonaswinkler#1291) * New translations django.po (French) [ci skip] * New translations messages.xlf (French) [ci skip] * New translations django.po (French) [ci skip] * New translations messages.xlf (French) [ci skip] * New translations messages.xlf (Turkish) [ci skip] * New translations django.po (Turkish) [ci skip] commit f3d99a5 Merge: ca33477 79de098 Author: shamoon <[email protected]> Date: Tue Jul 26 11:21:42 2022 -0700 Merge pull request jonaswinkler#1277 from paperless-ngx/fix/redo-ocr-button-on-edit Fix/feature: add redo ocr button to document edit view commit 79de098 Author: Michael Shamoon <[email protected]> Date: Tue Jul 26 09:54:05 2022 -0700 fix button icon spacing on mobile commit ca33477 Author: Paperless-ngx Translation Bot [bot] <[email protected]> Date: Tue Jul 26 09:45:21 2022 -0700 New Crowdin updates (jonaswinkler#1242) * New translations messages.xlf (Turkish) [ci skip] * New translations messages.xlf (German) [ci skip] * New translations django.po (German) [ci skip] * New translations messages.xlf (Italian) [ci skip] * New translations messages.xlf (Italian) [ci skip] * New translations messages.xlf (Finnish) [ci skip] * New translations messages.xlf (Finnish) [ci skip] commit 1071357 Merge: f32dfe0 ef790ca Author: shamoon <[email protected]> Date: Tue Jul 26 09:44:42 2022 -0700 Merge pull request jonaswinkler#1268 from paperless-ngx/bugfix-db-locked Bugfix: Adds configuration for database timeout, fixing database locked error commit f32dfe0 Merge: 611707a 4e78ca5 Author: shamoon <[email protected]> Date: Mon Jul 25 12:59:31 2022 -0700 Merge pull request jonaswinkler#1261 from paperless-ngx/fix/b1.8.0-ng-select-dropdowns Fix: dropdown selected items not visible again commit 278cedf Merge: b141671 ecc4553 Author: shamoon <[email protected]> Date: Mon Jul 25 09:25:52 2022 -0700 Merge pull request jonaswinkler#1272 from paperless-ngx/fix-1263 Documentation: fix occasional code block color legibility commit 45a6b5a Author: Michael Shamoon <[email protected]> Date: Sun Jul 24 20:15:26 2022 -0700 Add redo OCR button to document edit commit 611707a Merge: 2d88638 b4d20d9 Author: shamoon <[email protected]> Date: Sun Jul 24 19:59:30 2022 -0700 Merge pull request jonaswinkler#1276 from paperless-ngx/bugfix-webp-import Bugfix: Document import doesn't convert thumbnails to WebP commit b4d20d9 Author: Trenton Holmes <[email protected]> Date: Sun Jul 24 10:22:53 2022 -0700 Fixes document import copying PNG files to .webp extensions without actual conversion commit ecc4553 Author: Michael Shamoon <[email protected]> Date: Fri Jul 22 15:10:33 2022 -0700 fix occasional code block color legibility commit ef790ca Author: Trenton Holmes <[email protected]> Date: Fri Jul 22 11:08:52 2022 -0700 Fixes the copy and paste of the log line commit 2d88638 Merge: 0e2e5f3 91ba0bd Author: shamoon <[email protected]> Date: Fri Jul 22 10:45:53 2022 -0700 Merge pull request jonaswinkler#1269 from paperless-ngx/beta-deps-final Chore: Locks dependencies to the final versions for the beta commit 91ba0bd Author: Trenton Holmes <[email protected]> Date: Fri Jul 22 08:53:02 2022 -0700 Locks dependencies to the final versions for the beta commit 0e2e5f3 Author: Trenton Holmes <[email protected]> Date: Tue Jul 19 13:57:00 2022 -0700 Creates utiliy to ensure all paths in settings are normalized and absolute commit 7a99dcf Author: Trenton Holmes <[email protected]> Date: Thu Jul 21 08:02:11 2022 -0700 Adds configuration for database timeout, documentation and troubleshotting suggestion commit 4e78ca5 Author: Michael Shamoon <[email protected]> Date: Wed Jul 20 11:15:35 2022 -0700 remove merge error ng-select css commit 83de38e Merge: f4be2e4 b1b6d50 Author: shamoon <[email protected]> Date: Wed Jul 20 08:26:12 2022 -0700 Merge pull request jonaswinkler#1247 from paperless-ngx/bugfix-pikepdf-ocrmypdf-warnings Bugfix: Adds pngquant and jbig2dec to Docker image commit f4be2e4 Merge: 4444925 16b0f7f Author: Quinn Casey <[email protected]> Date: Tue Jul 19 21:03:16 2022 -0700 Merge pull request #1259 from paperless-ngx/chore-add-ci-hadolint Chore: Add Hadolint job to CI commit 16b0f7f Author: Trenton Holmes <[email protected]> Date: Tue Jul 19 14:18:47 2022 -0700 Removes a Dockerfile I can't find referenced anywhere commit 27721ae Author: Trenton Holmes <[email protected]> Date: Tue Jul 19 14:01:47 2022 -0700 Fixes and updates the Hadolint action version commit 329a317 Author: Trenton Holmes <[email protected]> Date: Tue Jul 19 13:54:33 2022 -0700 Configure Hadolint in a single location for both hooks and CI commit daad634 Author: Trenton Holmes <[email protected]> Date: Fri Jul 15 13:45:23 2022 -0700 Adds a CI job for hadolint over all the Dockerfiles, fixes the minor thing it complained about commit 4444925 Merge: 4c697ab 9c1ae96 Author: shamoon <[email protected]> Date: Mon Jul 18 15:55:29 2022 -0700 Merge pull request jonaswinkler#1249 from paperless-ngx/fix-generated-changelog [CI] Fix automatic changelog generation on release commit 9c1ae96 Author: Quinn Casey <[email protected]> Date: Mon Jul 18 09:48:03 2022 -0700 Create PR for changelog instead of direct commit commit b1b6d50 Author: Trenton Holmes <[email protected]> Date: Mon Jul 18 09:46:31 2022 -0700 Adds a couple packages to the Docker image for ocrmypdf and pikepdf commit 4c697ab Author: Quinn Casey <[email protected]> Date: Sun Jul 17 15:23:28 2022 -0700 Bump version to beta commit b141671 Merge: 48dfbbe 2ab2d91 Author: Quinn Casey <[email protected]> Date: Sun Jul 17 13:18:57 2022 -0700 Merge pull request jonaswinkler#1237 from tooomm/patch-1 chore: Run stale bot only on certain labels commit 2ab2d91 Author: shamoon <[email protected]> Date: Fri Jul 15 20:19:28 2022 -0700 Use cant-reproduce for stale commit 2784534 Author: tooomm <[email protected]> Date: Fri Jul 15 21:18:38 2022 +0200 only run on certain labels commit 48dfbbe Merge: 8efb97e e568b30 Author: shamoon <[email protected]> Date: Sun Jul 3 07:42:20 2022 -0700 Merge pull request jonaswinkler#1110 from paperless-ngx/update-issue-form commit 8efb97e Author: shamoon <[email protected]> Date: Sat Jul 2 19:06:32 2022 -0700 Update stale.yml [ci skip] commit d8cda7f Author: shamoon <[email protected]> Date: Sat Jul 2 17:51:39 2022 -0700 Use any-of-labels for stalebot [ci skip] commit 68f0cf4 Merge: 666b938 26b1251 Author: Felix E <[email protected]> Date: Mon Jun 20 14:25:59 2022 +0200 Merge pull request jonaswinkler#1148 from pReya/patch-1 fix: update scanner capability commit 26b1251 Author: Moritz Stückler <[email protected]> Date: Mon Jun 20 12:06:54 2022 +0200 fix: update scanner capability The Brother ADS-A1700W does indeed support SFTP. I've just bought it, and set it up like this. commit e568b30 Author: shamoon <[email protected]> Date: Tue Jun 7 15:28:49 2022 -0700 Add lsio to issue form commit 666b938 Merge: de5eaf1 163231d Author: Quinn Casey <[email protected]> Date: Thu May 19 17:23:23 2022 -0700 Merge pull request jonaswinkler#990 from tooomm/patch-2 Docs: Fix headings and add links to PRs in changelog commit 163231d Author: tooomm <[email protected]> Date: Thu May 19 23:12:40 2022 +0200 Link issues, capitalization and minor fixes commit e530750 Author: tooomm <[email protected]> Date: Thu May 19 22:05:43 2022 +0200 update heading levels for v1.7.0
1 parent 7450088 commit 05feadb

File tree

33 files changed

+838
-516
lines changed

33 files changed

+838
-516
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,11 @@ body:
6363
attributes:
6464
label: Installation method
6565
options:
66-
- Docker
66+
- Docker - official image
67+
- Docker - linuxserver.io image
6768
- Bare metal
6869
- Other (please describe above)
70+
description: Note there are significant differences from the official image and linuxserver.io, please check if your issue is specific to the third-party image.
6971
validations:
7072
required: true
7173
- type: input

.github/stale.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
# Number of days of inactivity before an issue becomes stale
22
daysUntilStale: 30
3+
34
# Number of days of inactivity before a stale issue is closed
45
daysUntilClose: 7
5-
onlyLabels:
6-
- unconfirmed
6+
7+
# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
8+
onlyLabels: [cant-reproduce]
9+
710
# Label to use when marking an issue as stale
811
staleLabel: stale
12+
913
# Comment to post when marking an issue as stale. Set to `false` to disable
1014
markComment: >
1115
This issue has been automatically marked as stale because it has not had
1216
recent activity. It will be closed if no further activity occurs. Thank you
1317
for your contributions.
18+
1419
# Comment to post when closing a stale issue. Set to `false` to disable
1520
closeComment: false
21+
22+
# See https://github.com/marketplace/stale for more info on the app
23+
# and https://github.com/probot/stale for the configuration docs

.github/workflows/ci.yml

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,10 @@ jobs:
305305

306306
publish-release:
307307
runs-on: ubuntu-20.04
308+
outputs:
309+
prerelease: ${{ steps.get_version.outputs.prerelease }}
310+
changelog: ${{ steps.create-release.outputs.body }}
311+
version: ${{ steps.get_version.outputs.version }}
308312
needs:
309313
- build-release
310314
if: github.ref_type == 'tag' && (startsWith(github.ref_name, 'v') || contains(github.ref_name, '-beta.rc'))
@@ -348,6 +352,13 @@ jobs:
348352
asset_path: ./paperless-ngx.tar.xz
349353
asset_name: paperless-ngx-${{ steps.get_version.outputs.version }}.tar.xz
350354
asset_content_type: application/x-xz
355+
356+
append-changelog:
357+
runs-on: ubuntu-20.04
358+
needs:
359+
- publish-release
360+
if: needs.publish-release.outputs.prerelease == 'false'
361+
steps:
351362
-
352363
name: Checkout
353364
uses: actions/checkout@v3
@@ -358,11 +369,33 @@ jobs:
358369
id: append-Changelog
359370
working-directory: docs
360371
run: |
361-
echo -e "# Changelog\n\n${{ steps.create-release.outputs.body }}\n" > changelog-new.md
372+
git branch ${{ needs.publish-release.outputs.version }}-changelog
373+
git checkout ${{ needs.publish-release.outputs.version }}-changelog
374+
echo -e "# Changelog\n\n${{ needs.publish-release.outputs.changelog }}\n" > changelog-new.md
362375
CURRENT_CHANGELOG=`tail --lines +2 changelog.md`
363376
echo -e "$CURRENT_CHANGELOG" >> changelog-new.md
364377
mv changelog-new.md changelog.md
365378
git config --global user.name "github-actions"
366379
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
367380
git commit -am "Changelog ${{ steps.get_version.outputs.version }} - GHA"
368-
git push origin HEAD:main
381+
git push origin ${{ needs.publish-release.outputs.version }}-changelog
382+
-
383+
name: Create Pull Request
384+
uses: actions/github-script@v6
385+
with:
386+
script: |
387+
const { repo, owner } = context.repo;
388+
const result = await github.rest.pulls.create({
389+
title: '[Documentation] Add ${{ needs.publish-release.outputs.version }} changelog',
390+
owner,
391+
repo,
392+
head: '${{ needs.publish-release.outputs.version }}-changelog',
393+
base: 'main',
394+
body: 'This PR is auto-generated by CI.'
395+
});
396+
github.rest.issues.addLabels({
397+
owner,
398+
repo,
399+
issue_number: result.data.number,
400+
labels: ['documentation']
401+
});

.github/workflows/reusable-ci-backend.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,24 @@ jobs:
106106
run: |
107107
cd src/
108108
pipenv run coveralls --service=github
109+
110+
dockerfile-lint:
111+
name: "Lint ${{ matrix.dockerfile }}"
112+
runs-on: ubuntu-20.04
113+
strategy:
114+
matrix:
115+
dockerfile:
116+
- Dockerfile
117+
- docker-builders/Dockerfile.qpdf
118+
- docker-builders/Dockerfile.jbig2enc
119+
- docker-builders/Dockerfile.psycopg2
120+
- docker-builders/Dockerfile.pikepdf
121+
fail-fast: false
122+
steps:
123+
-
124+
name: Checkout
125+
uses: actions/checkout@v3
126+
-
127+
uses: hadolint/[email protected]
128+
with:
129+
dockerfile: ${{ matrix.dockerfile }}

.hadolint.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
failure-threshold: warning
2+
ignored:
3+
# https://github.com/hadolint/hadolint/wiki/DL3008
4+
- DL3008
5+
# https://github.com/hadolint/hadolint/wiki/DL3013
6+
- DL3013
7+
# https://github.com/hadolint/hadolint/wiki/DL3003
8+
- DL3003

.pre-commit-config.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,6 @@ repos:
7474
rev: v2.10.0
7575
hooks:
7676
- id: hadolint
77-
args:
78-
- --ignore
79-
- DL3008 # https://github.com/hadolint/hadolint/wiki/DL3008 (should probably do this at some point)
80-
- --ignore
81-
- DL3013 # https://github.com/hadolint/hadolint/wiki/DL3013 (should probably do this too at some point)
82-
- --ignore
83-
- DL3003 # https://github.com/hadolint/hadolint/wiki/DL3003 (seems excessive to use WORKDIR so much)
8477
# Shell script hooks
8578
- repo: https://github.com/lovesegfault/beautysh
8679
rev: v6.2.1

Dockerfile

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ ARG RUNTIME_PACKAGES="\
9090
tesseract-ocr-fra \
9191
tesseract-ocr-ita \
9292
tesseract-ocr-spa \
93+
# Suggested for OCRmyPDF
94+
pngquant \
95+
# Suggested for pikepdf
96+
jbig2dec \
9397
tzdata \
9498
unpaper \
9599
# Mime type detection
@@ -117,19 +121,18 @@ COPY gunicorn.conf.py .
117121
# setup docker-specific things
118122
# Use mounts to avoid copying installer files into the image
119123
# These change sometimes, but rarely
120-
ARG DOCKER_SRC=/usr/src/paperless/src/docker/
121-
WORKDIR ${DOCKER_SRC}
124+
WORKDIR /usr/src/paperless/src/docker/
122125

123126
COPY [ \
124-
"docker/imagemagick-policy.xml", \
125-
"docker/supervisord.conf", \
126-
"docker/docker-entrypoint.sh", \
127-
"docker/docker-prepare.sh", \
128-
"docker/paperless_cmd.sh", \
129-
"docker/wait-for-redis.py", \
130-
"docker/management_script.sh", \
131-
"docker/install_management_commands.sh", \
132-
"${DOCKER_SRC}" \
127+
"docker/imagemagick-policy.xml", \
128+
"docker/supervisord.conf", \
129+
"docker/docker-entrypoint.sh", \
130+
"docker/docker-prepare.sh", \
131+
"docker/paperless_cmd.sh", \
132+
"docker/wait-for-redis.py", \
133+
"docker/management_script.sh", \
134+
"docker/install_management_commands.sh", \
135+
"/usr/src/paperless/src/docker/" \
133136
]
134137

135138
RUN set -eux \
@@ -162,15 +165,15 @@ RUN --mount=type=bind,from=qpdf-builder,target=/qpdf \
162165
&& apt-get install --yes --no-install-recommends /qpdf/usr/src/qpdf/libqpdf28_*.deb \
163166
&& apt-get install --yes --no-install-recommends /qpdf/usr/src/qpdf/qpdf_*.deb \
164167
&& echo "Installing pikepdf and dependencies" \
168+
&& python3 -m pip install --no-cache-dir /pikepdf/usr/src/wheels/pyparsing*.whl \
165169
&& python3 -m pip install --no-cache-dir /pikepdf/usr/src/wheels/packaging*.whl \
166170
&& python3 -m pip install --no-cache-dir /pikepdf/usr/src/wheels/lxml*.whl \
167171
&& python3 -m pip install --no-cache-dir /pikepdf/usr/src/wheels/Pillow*.whl \
168-
&& python3 -m pip install --no-cache-dir /pikepdf/usr/src/wheels/pyparsing*.whl \
169172
&& python3 -m pip install --no-cache-dir /pikepdf/usr/src/wheels/pikepdf*.whl \
170-
&& python -m pip list \
173+
&& python3 -m pip list \
171174
&& echo "Installing psycopg2" \
172175
&& python3 -m pip install --no-cache-dir /psycopg2/usr/src/wheels/psycopg2*.whl \
173-
&& python -m pip list
176+
&& python3 -m pip list
174177

175178
# Python dependencies
176179
# Change pretty frequently

0 commit comments

Comments
 (0)