mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2025-04-09 09:58:20 -05:00
Converts tabs to spaces and update EditorConfig for the new files
This commit is contained in:
parent
d9d6b7b151
commit
bdcc6f861d
@ -33,5 +33,5 @@ indent_style = space
|
|||||||
[**/test_*.py]
|
[**/test_*.py]
|
||||||
max_line_length = off
|
max_line_length = off
|
||||||
|
|
||||||
[Dockerfile]
|
[Dockerfile*]
|
||||||
indent_style = space
|
indent_style = space
|
||||||
|
@ -47,7 +47,7 @@ repos:
|
|||||||
- id: yesqa
|
- id: yesqa
|
||||||
exclude: "(migrations)"
|
exclude: "(migrations)"
|
||||||
- repo: https://github.com/asottile/add-trailing-comma
|
- repo: https://github.com/asottile/add-trailing-comma
|
||||||
rev: "v2.2.2"
|
rev: "v2.2.3"
|
||||||
hooks:
|
hooks:
|
||||||
- id: add-trailing-comma
|
- id: add-trailing-comma
|
||||||
exclude: "(migrations)"
|
exclude: "(migrations)"
|
||||||
@ -64,16 +64,16 @@ repos:
|
|||||||
- id: black
|
- id: black
|
||||||
# Dockerfile hooks
|
# Dockerfile hooks
|
||||||
- repo: https://github.com/AleksaC/hadolint-py
|
- repo: https://github.com/AleksaC/hadolint-py
|
||||||
rev: v1.19.0
|
rev: v2.10.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: hadolint
|
- id: hadolint
|
||||||
args:
|
args:
|
||||||
- --ignore
|
|
||||||
- DL3006 # https://github.com/hadolint/hadolint/wiki/DL3006 (doesn't understand FROM with ARG)
|
|
||||||
- --ignore
|
- --ignore
|
||||||
- DL3008 # https://github.com/hadolint/hadolint/wiki/DL3008 (should probably do this at some point)
|
- DL3008 # https://github.com/hadolint/hadolint/wiki/DL3008 (should probably do this at some point)
|
||||||
- --ignore
|
- --ignore
|
||||||
- DL3013 # https://github.com/hadolint/hadolint/wiki/DL3013 (should probably do this too at some point)
|
- DL3013 # https://github.com/hadolint/hadolint/wiki/DL3013 (should probably do this too at some point)
|
||||||
|
- --ignore
|
||||||
|
- DL3003 # https://github.com/hadolint/hadolint/wiki/DL3003 (seems excessive to use WORKDIR so much)
|
||||||
# Shell script hooks
|
# Shell script hooks
|
||||||
- repo: https://github.com/lovesegfault/beautysh
|
- repo: https://github.com/lovesegfault/beautysh
|
||||||
rev: v6.2.1
|
rev: v6.2.1
|
||||||
|
@ -25,7 +25,7 @@ RUN set -eux \
|
|||||||
&& apt-get update --quiet \
|
&& apt-get update --quiet \
|
||||||
&& apt-get install --yes --quiet --no-install-recommends $BUILD_PACKAGES \
|
&& apt-get install --yes --quiet --no-install-recommends $BUILD_PACKAGES \
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& python3 -m pip install --upgrade pip wheel
|
&& python3 -m pip install --no-cache-dir --upgrade pip wheel
|
||||||
|
|
||||||
# Layers after this point change according to required version
|
# Layers after this point change according to required version
|
||||||
# For better caching, seperate the basic installs from
|
# For better caching, seperate the basic installs from
|
||||||
|
@ -37,15 +37,16 @@ ARG QPDF_VERSION
|
|||||||
# and then built from source
|
# and then built from source
|
||||||
RUN set -eux \
|
RUN set -eux \
|
||||||
&& echo "Building qpdf" \
|
&& echo "Building qpdf" \
|
||||||
&& echo "deb-src http://deb.debian.org/debian/ bookworm main" | tee /etc/apt/sources.list.d/bookworm-src.list \
|
&& echo "deb-src http://deb.debian.org/debian/ bookworm main" > /etc/apt/sources.list.d/bookworm-src.list \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& mkdir qpdf \
|
&& mkdir qpdf \
|
||||||
&& cd qpdf \
|
&& cd qpdf \
|
||||||
&& apt-get source --yes --quiet qpdf=${QPDF_VERSION}-1/bookworm \
|
&& apt-get source --yes --quiet qpdf=${QPDF_VERSION}-1/bookworm \
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& cd qpdf-$QPDF_VERSION \
|
&& cd qpdf-$QPDF_VERSION \
|
||||||
|
# We don't need to build the tests (also don't run them)
|
||||||
|
&& rm -rf libtests \
|
||||||
&& DEBEMAIL=hello@paperless-ngx.com debchange --bpo \
|
&& DEBEMAIL=hello@paperless-ngx.com debchange --bpo \
|
||||||
&& export DEB_BUILD_OPTIONS="terse nocheck nodoc parallel=2" \
|
&& export DEB_BUILD_OPTIONS="terse nocheck nodoc parallel=2" \
|
||||||
&& dpkg-buildpackage --build=binary --unsigned-source --unsigned-changes \
|
&& dpkg-buildpackage --build=binary --unsigned-source --unsigned-changes \
|
||||||
&& pwd \
|
|
||||||
&& ls -ahl ../*.deb
|
&& ls -ahl ../*.deb
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
FROM python:3.5.1
|
FROM python:3.5.1
|
||||||
|
|
||||||
# Install Sphinx and Pygments
|
# Install Sphinx and Pygments
|
||||||
RUN pip install Sphinx Pygments
|
RUN pip install --no-cache-dir Sphinx Pygments \
|
||||||
|
# Setup directories, copy data
|
||||||
|
&& mkdir /build
|
||||||
|
|
||||||
# Setup directories, copy data
|
|
||||||
RUN mkdir /build
|
|
||||||
COPY . /build
|
COPY . /build
|
||||||
WORKDIR /build/docs
|
WORKDIR /build/docs
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user