mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-23 09:33:09 +02:00
DockerでAlpineではなくDebianを使用するように (#8966)
* Debian * CHANGELOG * Update CHANGELOG
This commit is contained in:
parent
481783606f
commit
417e75b470
2 changed files with 20 additions and 16 deletions
|
@ -9,6 +9,14 @@
|
||||||
You should also include the user name that made the change.
|
You should also include the user name that made the change.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
## 12.x.x (unreleased)
|
||||||
|
|
||||||
|
### Improvements
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
- Fix Docker doesn't work @mei23
|
||||||
|
Still not working on arm64 environment. (See 12.112.0)
|
||||||
|
|
||||||
## 12.112.1 (2022/07/07)
|
## 12.112.1 (2022/07/07)
|
||||||
same as 12.112.0
|
same as 12.112.0
|
||||||
|
|
||||||
|
|
28
Dockerfile
28
Dockerfile
|
@ -1,28 +1,24 @@
|
||||||
FROM node:18.0.0-alpine3.15 AS base
|
FROM node:16.15.1-bullseye AS builder
|
||||||
|
|
||||||
ARG NODE_ENV=production
|
ARG NODE_ENV=production
|
||||||
|
|
||||||
WORKDIR /misskey
|
WORKDIR /misskey
|
||||||
|
|
||||||
ENV BUILD_DEPS autoconf automake file g++ gcc libc-dev libtool make nasm pkgconfig python3 zlib-dev git
|
|
||||||
|
|
||||||
FROM base AS builder
|
|
||||||
|
|
||||||
COPY . ./
|
COPY . ./
|
||||||
|
|
||||||
RUN apk add --no-cache $BUILD_DEPS && \
|
RUN apt-get update
|
||||||
git submodule update --init && \
|
RUN apt-get install -y build-essential
|
||||||
yarn install && \
|
RUN git submodule update --init
|
||||||
yarn build && \
|
RUN yarn install
|
||||||
rm -rf .git
|
RUN yarn build
|
||||||
|
RUN rm -rf .git
|
||||||
|
|
||||||
FROM base AS runner
|
FROM node:16.15.1-bullseye-slim AS runner
|
||||||
|
|
||||||
RUN apk add --no-cache \
|
WORKDIR /misskey
|
||||||
ffmpeg \
|
|
||||||
tini
|
|
||||||
|
|
||||||
ENTRYPOINT ["/sbin/tini", "--"]
|
RUN apt-get update
|
||||||
|
RUN apt-get install -y ffmpeg tini
|
||||||
|
|
||||||
COPY --from=builder /misskey/node_modules ./node_modules
|
COPY --from=builder /misskey/node_modules ./node_modules
|
||||||
COPY --from=builder /misskey/built ./built
|
COPY --from=builder /misskey/built ./built
|
||||||
|
@ -32,5 +28,5 @@ COPY --from=builder /misskey/packages/client/node_modules ./packages/client/node
|
||||||
COPY . ./
|
COPY . ./
|
||||||
|
|
||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
|
ENTRYPOINT ["/usr/bin/tini", "--"]
|
||||||
CMD ["npm", "run", "migrateandstart"]
|
CMD ["npm", "run", "migrateandstart"]
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue