graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-30 13:33:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

Browse source
This commit is contained in:
syuilo 2021-03-05 17:01:35 +09:00
commit a3f75fe3f4
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.node-version
View file

@ -1 +1 @@
v14.15.4 v14.15.5

14
Dockerfile
View file

@ -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