Merge branch 'develop' of github.com:thecodingmachine/workadventure

This commit is contained in:
_Bastler
2022-01-03 19:10:22 +01:00
52 changed files with 1449 additions and 863 deletions
+6 -4
View File
@@ -2,7 +2,7 @@
FROM node:14-buster-slim as messages
WORKDIR /usr/src
COPY messages .
RUN yarn install && yarn proto
RUN yarn install && yarn ts-proto
# webpack build
FROM node:14-buster-slim as builder
@@ -10,9 +10,11 @@ WORKDIR /usr/src
COPY front/yarn.lock front/package.json ./
RUN yarn install --ignore-engines
COPY front .
COPY --from=messages /usr/src/generated src/Messages/generated
COPY --from=messages /usr/src/JsonMessages src/Messages/JsonMessages
COPY --chown=docker:docker front .
COPY --from=messages --chown=docker:docker /usr/src/ts-proto-generated/protos /var/www/html/src/Messages/ts-proto-generated
RUN sed -i 's/import { Observable } from "rxjs";/import type { Observable } from "rxjs";/g' /var/www/html/src/Messages/ts-proto-generated/messages.ts
COPY --from=messages --chown=docker:docker /usr/src/JsonMessages /var/www/html/src/Messages/JsonMessages
# passing arguments as environment
ARG DEBUG_MODE