mirror of
https://iceshrimp.dev/limepotato/jormungandr-bite.git
synced 2024-11-18 16:07:31 -07:00
Merge branch 'develop'
This commit is contained in:
syuilo
commit
54d6c7c1b1
299 changed files with 3355 additions and 394 deletions
|
|
@ -1 +1 @@
|
||||||
v14.15.4
|
v14.15.5
|
||||||
|
|
|
||||||
14
Dockerfile
14
Dockerfile
|
|
@ -1,4 +1,4 @@
|
||||||
FROM node:14.15.4-alpine AS base
|
FROM node:14.15.5-alpine3.13 AS base
|
||||||
|
|
||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
|
|
||||||
|
|
@ -10,7 +10,6 @@ RUN apk add --no-cache \
|
||||||
autoconf \
|
autoconf \
|
||||||
automake \
|
automake \
|
||||||
file \
|
file \
|
||||||
git \
|
|
||||||
g++ \
|
g++ \
|
||||||
gcc \
|
gcc \
|
||||||
libc-dev \
|
libc-dev \
|
||||||
|
|
@ -18,8 +17,10 @@ RUN apk add --no-cache \
|
||||||
make \
|
make \
|
||||||
nasm \
|
nasm \
|
||||||
pkgconfig \
|
pkgconfig \
|
||||||
python \
|
python3 \
|
||||||
zlib-dev
|
zlib-dev \
|
||||||
|
vips-dev \
|
||||||
|
vips
|
||||||
|
|
||||||
COPY package.json yarn.lock ./
|
COPY package.json yarn.lock ./
|
||||||
RUN yarn install
|
RUN yarn install
|
||||||
|
|
@ -30,8 +31,9 @@ FROM base AS runner
|
||||||
|
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
ffmpeg \
|
ffmpeg \
|
||||||
tini
|
tini \
|
||||||
RUN npm i -g web-push
|
vips
|
||||||
|
|
||||||
ENTRYPOINT ["/sbin/tini", "--"]
|
ENTRYPOINT ["/sbin/tini", "--"]
|
||||||
|
|
||||||
COPY --from=builder /misskey/node_modules ./node_modules
|
COPY --from=builder /misskey/node_modules ./node_modules
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue