Elijah/convertor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dcraw almost working

Browse source
This commit is contained in:
C4illin 2025-02-16 23:38:25 +01:00
parent 67fef4edfb
commit 3da6734e10
2 changed files with 61 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

103
.gitignore vendored
View file

@ -1,51 +1,52 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# dependencies # dependencies
/node_modules /node_modules
/.pnp /.pnp
.pnp.js .pnp.js
# testing # testing
/coverage /coverage
# next.js # next.js
/.next/ /.next/
/out/ /out/
# production # production
/build /build
# misc # misc
.DS_Store .DS_Store
*.pem *.pem
# debug # debug
npm-debug.log* npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
# local env files # local env files
.env.local .env.local
.env.development.local .env.development.local
.env.test.local .env.test.local
.env.production.local .env.production.local
# vercel # vercel
.vercel .vercel
**/*.trace **/*.trace
**/*.zip **/*.zip
**/*.tar.gz **/*.tar.gz
**/*.tgz **/*.tgz
**/*.log **/*.log
package-lock.json package-lock.json
**/*.bun **/*.bun
/src/uploads /src/uploads
/uploads /uploads
/mydb.sqlite /mydb.sqlite
/output /output
/db /db
/data /data
/Bruno /Bruno
/tsconfig.tsbuildinfo /tsconfig.tsbuildinfo
/public/generated.css /public/generated.css
/dcraw

24
Dockerfile
View file

@ -2,10 +2,6 @@ FROM oven/bun:1.2.2-alpine AS base
LABEL org.opencontainers.image.source="https://github.com/C4illin/ConvertX" LABEL org.opencontainers.image.source="https://github.com/C4illin/ConvertX"
WORKDIR /app WORKDIR /app
RUN apk --no-cache add \
gettext \
libc6-compat
# install dependencies into temp directory # install dependencies into temp directory
# this will cache them and speed up future builds # this will cache them and speed up future builds
FROM base AS install FROM base AS install
@ -18,21 +14,19 @@ RUN mkdir -p /temp/prod
COPY package.json bun.lock /temp/prod/ COPY package.json bun.lock /temp/prod/
RUN cd /temp/prod && bun install --frozen-lockfile --production RUN cd /temp/prod && bun install --frozen-lockfile --production
FROM base AS builder FROM base AS resvg
RUN apk --no-cache add curl gcc RUN apk --no-cache add curl gcc
ENV PATH=/root/.cargo/bin:$PATH ENV PATH=/root/.cargo/bin:$PATH
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
RUN cargo install resvg RUN cargo install resvg
FROM base AS dcraw
# build dcraw # build dcraw
RUN cd /tmp ; \ 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
wget https://www.dechifro.org/dcraw/archive/dcraw-9.28.0.tar.gz ; \ RUN mkdir -p /temp
tar -xzvf dcraw-*.tar.gz ; \ WORKDIR /temp
cd /tmp/dcraw ; \ RUN wget https://www.dechifro.org/dcraw/archive/dcraw-9.28.0.tar.gz ; \
sed 's/-llcms2/-llcms2 -lintl/' <install >install.new && mv install.new install ; \ tar -xzvf dcraw-*.tar.gz ; cd dcraw ; chmod 755 install ; ./install ;
chmod 755 install ;
RUN cd /tmp/dcraw ; \
./install ;
# copy node_modules from temp directory # copy node_modules from temp directory
# then copy all (non-ignored) project files into the image # then copy all (non-ignored) project files into the image
@ -81,8 +75,8 @@ RUN apk --no-cache add calibre --repository=http://dl-cdn.alpinelinux.org/alpine
# texmf-dist-fontsextra \ # texmf-dist-fontsextra \
COPY --from=install /temp/prod/node_modules node_modules 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=builder /usr/local/bin/dcraw /usr/local/bin/dcraw COPY --from=dcraw /usr/local/bin/dcraw /usr/local/bin/dcraw
COPY --from=prerelease /app/public/generated.css /app/public/ COPY --from=prerelease /app/public/generated.css /app/public/
# COPY --from=prerelease /app/src/index.tsx /app/src/ # COPY --from=prerelease /app/src/index.tsx /app/src/
# COPY --from=prerelease /app/package.json . # COPY --from=prerelease /app/package.json .