diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2021-03-05 17:01:35 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2021-03-05 17:01:35 +0900 |
| commit | a3f75fe3f4263577bf9bf094f8142a47b08d4a08 (patch) | |
| tree | f7c82b22b8e160430ced73004101eaae24746a32 | |
| parent | refactor modal (diff) | |
| parent | Use alpine3.13 on Docker (#7249) (diff) | |
| download | misskey-a3f75fe3f4263577bf9bf094f8142a47b08d4a08.tar.gz misskey-a3f75fe3f4263577bf9bf094f8142a47b08d4a08.tar.bz2 misskey-a3f75fe3f4263577bf9bf094f8142a47b08d4a08.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
| -rw-r--r-- | .node-version | 2 | ||||
| -rw-r--r-- | Dockerfile | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/.node-version b/.node-version index 9a0c3d3f45..ab155ce138 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -v14.15.4 +v14.15.5 diff --git a/Dockerfile b/Dockerfile index eba3a833bc..c1745fc215 100644 --- a/Dockerfile +++ b/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 @@ -10,7 +10,6 @@ RUN apk add --no-cache \ autoconf \ automake \ file \ - git \ g++ \ gcc \ libc-dev \ @@ -18,8 +17,10 @@ RUN apk add --no-cache \ make \ nasm \ pkgconfig \ - python \ - zlib-dev + python3 \ + zlib-dev \ + vips-dev \ + vips COPY package.json yarn.lock ./ RUN yarn install @@ -30,8 +31,9 @@ FROM base AS runner RUN apk add --no-cache \ ffmpeg \ - tini -RUN npm i -g web-push + tini \ + vips + ENTRYPOINT ["/sbin/tini", "--"] COPY --from=builder /misskey/node_modules ./node_modules |