mirror of
				https://github.com/C4illin/ConvertX.git
				synced 2025-10-31 12:03:31 +00:00 
			
		
		
		
	Compare commits
	
		
			3 Commits
		
	
	
		
			v0.12.0
			...
			fix/#199/a
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | bca82c6edc | ||
|  | 3da6734e10 | ||
|  | 67fef4edfb | 
							
								
								
									
										103
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										103
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -1,51 +1,52 @@ | ||||
| # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. | ||||
|  | ||||
| # dependencies | ||||
| /node_modules | ||||
| /.pnp | ||||
| .pnp.js | ||||
|  | ||||
| # testing | ||||
| /coverage | ||||
|  | ||||
| # next.js | ||||
| /.next/ | ||||
| /out/ | ||||
|  | ||||
| # production | ||||
| /build | ||||
|  | ||||
| # misc | ||||
| .DS_Store | ||||
| *.pem | ||||
|  | ||||
| # debug | ||||
| npm-debug.log* | ||||
| yarn-debug.log* | ||||
| yarn-error.log* | ||||
|  | ||||
| # local env files | ||||
| .env.local | ||||
| .env.development.local | ||||
| .env.test.local | ||||
| .env.production.local | ||||
|  | ||||
| # vercel | ||||
| .vercel | ||||
|  | ||||
| **/*.trace | ||||
| **/*.zip | ||||
| **/*.tar.gz | ||||
| **/*.tgz | ||||
| **/*.log | ||||
| package-lock.json | ||||
| **/*.bun | ||||
| /src/uploads | ||||
| /uploads | ||||
| /mydb.sqlite | ||||
| /output | ||||
| /db | ||||
| /data | ||||
| /Bruno | ||||
| /tsconfig.tsbuildinfo | ||||
| /public/generated.css | ||||
| # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. | ||||
|  | ||||
| # dependencies | ||||
| /node_modules | ||||
| /.pnp | ||||
| .pnp.js | ||||
|  | ||||
| # testing | ||||
| /coverage | ||||
|  | ||||
| # next.js | ||||
| /.next/ | ||||
| /out/ | ||||
|  | ||||
| # production | ||||
| /build | ||||
|  | ||||
| # misc | ||||
| .DS_Store | ||||
| *.pem | ||||
|  | ||||
| # debug | ||||
| npm-debug.log* | ||||
| yarn-debug.log* | ||||
| yarn-error.log* | ||||
|  | ||||
| # local env files | ||||
| .env.local | ||||
| .env.development.local | ||||
| .env.test.local | ||||
| .env.production.local | ||||
|  | ||||
| # vercel | ||||
| .vercel | ||||
|  | ||||
| **/*.trace | ||||
| **/*.zip | ||||
| **/*.tar.gz | ||||
| **/*.tgz | ||||
| **/*.log | ||||
| package-lock.json | ||||
| **/*.bun | ||||
| /src/uploads | ||||
| /uploads | ||||
| /mydb.sqlite | ||||
| /output | ||||
| /db | ||||
| /data | ||||
| /Bruno | ||||
| /tsconfig.tsbuildinfo | ||||
| /public/generated.css | ||||
| /dcraw | ||||
							
								
								
									
										13
									
								
								Dockerfile
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								Dockerfile
									
									
									
									
									
								
							| @@ -14,12 +14,20 @@ RUN mkdir -p /temp/prod | ||||
| COPY package.json bun.lock /temp/prod/ | ||||
| RUN cd /temp/prod && bun install --frozen-lockfile --production | ||||
|  | ||||
| FROM base AS builder | ||||
| FROM base AS resvg | ||||
| RUN apk --no-cache add curl gcc | ||||
| ENV PATH=/root/.cargo/bin:$PATH | ||||
| RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y | ||||
| RUN cargo install resvg | ||||
|  | ||||
| FROM base AS dcraw | ||||
| # build dcraw | ||||
| RUN apk --no-cache add build-base wget tar jasper-dev jpeg-dev lcms2-dev libc6-compat gettext libintl gettext-dev gettext-libs gettext-lang gettext-static intltool linux-tools-dev | ||||
| RUN mkdir -p /temp | ||||
| WORKDIR /temp | ||||
| RUN wget https://www.dechifro.org/dcraw/archive/dcraw-9.28.0.tar.gz ; \ | ||||
|   tar -xzvf dcraw-*.tar.gz ; cd dcraw ; chmod 755 install ; ./install ;  | ||||
|  | ||||
| # copy node_modules from temp directory | ||||
| # then copy all (non-ignored) project files into the image | ||||
| # will switch to alpine again when it works | ||||
| @@ -67,7 +75,8 @@ RUN apk --no-cache add calibre --repository=http://dl-cdn.alpinelinux.org/alpine | ||||
| #   texmf-dist-fontsextra \ | ||||
|  | ||||
| COPY --from=install /temp/prod/node_modules node_modules | ||||
| COPY --from=builder /root/.cargo/bin/resvg /usr/local/bin/resvg | ||||
| COPY --from=resvg /root/.cargo/bin/resvg /usr/local/bin/resvg | ||||
| COPY --from=dcraw /usr/local/bin/dcraw /usr/local/bin/dcraw | ||||
| COPY --from=prerelease /app/public/generated.css /app/public/ | ||||
| # COPY --from=prerelease /app/src/index.tsx /app/src/ | ||||
| # COPY --from=prerelease /app/package.json . | ||||
|   | ||||
		Reference in New Issue
	
	Block a user