liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: twemoji + headers fix

Browse Source
This commit is contained in:
Nicolas Giard
2019-01-18 15:58:39 -05:00
parent 86c6aabebd
commit 1771289188
8 changed files with 65 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dev/build/Dockerfile
View File

@@ -1,14 +1,14 @@
# ====================
# --- Build Assets ---
# ====================
FROM node:10.14-alpine AS assets
FROM node:10.15-alpine AS assets
RUN apk update && \
apk add yarn g++ make python --no-cache && \
rm -rf /var/cache/apk/* && \
mkdir -p /var/wiki
mkdir -p /wiki
WORKDIR /var/wiki
WORKDIR /wiki
COPY ./client ./client
COPY ./dev ./dev
@@ -19,28 +19,28 @@ COPY ./.eslintrc.yml ./.eslintrc.yml
RUN yarn --cache-folder /codefresh/volume/yarn
RUN yarn build
RUN rm -rf /var/wiki/node_modules
RUN rm -rf /wiki/node_modules
RUN yarn --production
# ===============
# --- Release ---
# ===============
FROM node:10.14-alpine
FROM node:10.15-alpine
LABEL maintainer="requarks.io"
RUN apk update && \
apk add bash curl git openssh supervisor --no-cache && \
rm -rf /var/cache/apk/* && \
mkdir -p /var/wiki && \
mkdir -p /wiki && \
mkdir -p /logs
WORKDIR /var/wiki
WORKDIR /wiki
COPY ./dev/build/supervisord.conf /etc/supervisord.conf
COPY --from=assets /var/wiki/assets ./assets
COPY --from=assets /var/wiki/node_modules ./node_modules
COPY --from=assets /wiki/assets ./assets
COPY --from=assets /wiki/node_modules ./node_modules
COPY ./server ./server
COPY --from=assets /var/wiki/server/views ./server/views
COPY --from=assets /wiki/server/views ./server/views
COPY ./dev/build/config.yml ./config.yml
COPY ./dev/docker/wait.sh ./wait.sh
COPY ./package.json ./package.json
@@ -48,4 +48,4 @@ COPY ./LICENSE ./LICENSE
EXPOSE 3000
CMD ["supervisord", "--nodaemon", "-c", "/etc/supervisord.conf"]
CMD ["node", "server"]