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

This commit is contained in:
syuilo 2018-10-30 21:55:25 +09:00
commit 72e672f08d
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69

View file

@ -3,8 +3,9 @@ FROM alpine:3.8 AS base
ENV NODE_ENV=production ENV NODE_ENV=production
RUN apk add --no-cache nodejs nodejs-npm zlib RUN apk add --no-cache nodejs nodejs-npm zlib
RUN npm i -g npm@latest
WORKDIR /misskey WORKDIR /misskey
COPY . ./
FROM base AS builder FROM base AS builder
@ -21,19 +22,23 @@ RUN apk add --no-cache \
pkgconfig \ pkgconfig \
libtool \ libtool \
zlib-dev zlib-dev
RUN npm i -g npm@latest \ RUN npm i -g node-gyp
&& npm i \
&& npm i -g node-gyp \ COPY ./package.json ./
&& node-gyp configure \ RUN npm i
COPY . ./
RUN node-gyp configure \
&& node-gyp build \ && node-gyp build \
&& npm run build && npm run build
FROM base AS runner FROM base AS runner
COPY --from=builder /misskey/built ./built
COPY --from=builder /misskey/node_modules ./node_modules
RUN apk add --no-cache tini RUN apk add --no-cache tini
ENTRYPOINT ["/sbin/tini", "--"] ENTRYPOINT ["/sbin/tini", "--"]
COPY --from=builder /misskey/node_modules ./node_modules
COPY --from=builder /misskey/built ./built
COPY . ./
CMD ["npm", "start"] CMD ["npm", "start"]