mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-10-30 03:56:23 -05:00 
			
		
		
		
	Updates to the latest and still working pipenv version. Updates to latest wheels
This commit is contained in:
		
							
								
								
									
										2
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							| @@ -16,7 +16,7 @@ on: | |||||||
| env: | env: | ||||||
|   # This is the version of pipenv all the steps will use |   # This is the version of pipenv all the steps will use | ||||||
|   # If changing this, change Dockerfile |   # If changing this, change Dockerfile | ||||||
|   DEFAULT_PIP_ENV_VERSION: "2022.11.30" |   DEFAULT_PIP_ENV_VERSION: "2023.3.20" | ||||||
|   # This is the default version of Python to use in most steps |   # This is the default version of Python to use in most steps | ||||||
|   # If changing this, change Dockerfile |   # If changing this, change Dockerfile | ||||||
|   DEFAULT_PYTHON_VERSION: "3.9" |   DEFAULT_PYTHON_VERSION: "3.9" | ||||||
|   | |||||||
							
								
								
									
										23
									
								
								Dockerfile
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								Dockerfile
									
									
									
									
									
								
							| @@ -29,7 +29,7 @@ COPY Pipfile* ./ | |||||||
|  |  | ||||||
| RUN set -eux \ | RUN set -eux \ | ||||||
|   && echo "Installing pipenv" \ |   && echo "Installing pipenv" \ | ||||||
|     && python3 -m pip install --no-cache-dir --upgrade pipenv==2022.11.30 \ |     && python3 -m pip install --no-cache-dir --upgrade pipenv==2023.3.20 \ | ||||||
|   && echo "Generating requirement.txt" \ |   && echo "Generating requirement.txt" \ | ||||||
|     && pipenv requirements > requirements.txt |     && pipenv requirements > requirements.txt | ||||||
|  |  | ||||||
| @@ -46,15 +46,6 @@ LABEL org.opencontainers.image.url="https://github.com/paperless-ngx/paperless-n | |||||||
| LABEL org.opencontainers.image.licenses="GPL-3.0-only" | LABEL org.opencontainers.image.licenses="GPL-3.0-only" | ||||||
|  |  | ||||||
| ARG DEBIAN_FRONTEND=noninteractive | ARG DEBIAN_FRONTEND=noninteractive | ||||||
| # Buildx provided, must be defined to use though |  | ||||||
| ARG TARGETARCH |  | ||||||
| ARG TARGETVARIANT |  | ||||||
|  |  | ||||||
| # Workflow provided |  | ||||||
| ARG JBIG2ENC_VERSION |  | ||||||
| ARG QPDF_VERSION |  | ||||||
| ARG PIKEPDF_VERSION |  | ||||||
| ARG PSYCOPG2_VERSION |  | ||||||
|  |  | ||||||
| # | # | ||||||
| # Begin installation and configuration | # Begin installation and configuration | ||||||
| @@ -175,12 +166,22 @@ RUN set -eux \ | |||||||
|     && chmod +x install_management_commands.sh \ |     && chmod +x install_management_commands.sh \ | ||||||
|     && ./install_management_commands.sh |     && ./install_management_commands.sh | ||||||
|  |  | ||||||
|  | # Buildx provided, must be defined to use though | ||||||
|  | ARG TARGETARCH | ||||||
|  | ARG TARGETVARIANT | ||||||
|  |  | ||||||
|  | # Workflow provided, defaults set for manual building | ||||||
|  | ARG JBIG2ENC_VERSION=0.29 | ||||||
|  | ARG QPDF_VERSION=11.3.0 | ||||||
|  | ARG PIKEPDF_VERSION=7.1.1 | ||||||
|  | ARG PSYCOPG2_VERSION=2.9.5 | ||||||
|  |  | ||||||
| # Install the built packages from the installer library images | # Install the built packages from the installer library images | ||||||
| # These change sometimes | # These change sometimes | ||||||
| RUN set -eux \ | RUN set -eux \ | ||||||
|   && echo "Getting binaries" \ |   && echo "Getting binaries" \ | ||||||
|     && mkdir paperless-ngx \ |     && mkdir paperless-ngx \ | ||||||
|     && curl --fail --silent --show-error --output paperless-ngx.tar.gz --location https://github.com/paperless-ngx/paperless-ngx/archive/40895f1cdb7702d8cd4b9c3b1d1d7a886018ccd2.tar.gz \ |     && curl --fail --silent --show-error --output paperless-ngx.tar.gz --location https://github.com/paperless-ngx/paperless-ngx/archive/ba28a1e16c27d121b644b4f6bdb78855a2850561.tar.gz \ | ||||||
|     && tar -xf paperless-ngx.tar.gz --directory paperless-ngx --strip-components=1 \ |     && tar -xf paperless-ngx.tar.gz --directory paperless-ngx --strip-components=1 \ | ||||||
|     && cd paperless-ngx \ |     && cd paperless-ngx \ | ||||||
|     # Setting a specific revision ensures we know what this installed |     # Setting a specific revision ensures we know what this installed | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Trenton H
					Trenton H