noby/workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup Dockerfiles, fix front Docker image build

Browse Source
This commit is contained in:
Piotr Dobrowolski 2021-01-08 00:20:27 +01:00 committed by Thomas Basler
parent baebc33a66
commit 7d15bb21cd
4 changed files with 53 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
back/Dockerfile
View File

@ -1,11 +1,11 @@
# protobuf build # protobuf build
FROM node:14.15.4-buster-slim@sha256:cbae886186467bbfd274b82a234a1cdfbbd31201c2a6ee63a6893eefcf3c6e76 as builder FROM node:14-buster-slim as builder
WORKDIR /usr/src WORKDIR /usr/src
COPY messages . COPY messages .
RUN yarn install && yarn proto RUN yarn install && yarn proto
# typescript build # typescript build
FROM node:14.15.4-buster-slim@sha256:cbae886186467bbfd274b82a234a1cdfbbd31201c2a6ee63a6893eefcf3c6e76 as builder2 FROM node:14-buster-slim as builder2
WORKDIR /usr/src WORKDIR /usr/src
COPY back/yarn.lock back/package.json ./ COPY back/yarn.lock back/package.json ./
RUN yarn install RUN yarn install
@ -15,7 +15,7 @@ ENV NODE_ENV=production
RUN yarn run tsc RUN yarn run tsc
# final production image # final production image
FROM node:14.15.4-buster-slim@sha256:cbae886186467bbfd274b82a234a1cdfbbd31201c2a6ee63a6893eefcf3c6e76 FROM node:14-buster-slim
WORKDIR /usr/src WORKDIR /usr/src
COPY back/yarn.lock back/package.json ./ COPY back/yarn.lock back/package.json ./
COPY --from=builder2 /usr/src/dist /usr/src/dist COPY --from=builder2 /usr/src/dist /usr/src/dist

44
front/Dockerfile
View File

@ -1,16 +1,38 @@
FROM thecodingmachine/workadventure-back-base:latest as builder # protobuf build
WORKDIR /var/www/messages FROM node:14-buster-slim as builder
COPY --chown=docker:docker messages . WORKDIR /usr/src
COPY messages .
RUN yarn install && yarn proto RUN yarn install && yarn proto
# we are rebuilding on each deploy to cope with the API_URL environment URL # webpack build
FROM thecodingmachine/nodejs:14-apache FROM node:14-buster-slim as builder2
WORKDIR /usr/src
COPY --chown=docker:docker front . COPY front/yarn.lock front/package.json ./
COPY --from=builder --chown=docker:docker /var/www/messages/generated /var/www/html/src/Messages/generated
RUN yarn install RUN yarn install
COPY front .
COPY --from=builder /usr/src/generated src/Messages/generated
ENV NODE_ENV=production ENV NODE_ENV=production
ENV STARTUP_COMMAND_0="./templater.sh"
ENV STARTUP_COMMAND_1="yarn run build" ARG ADMIN_URL=admin.$BASE_DOMAIN
ENV APACHE_DOCUMENT_ROOT=dist/ ARG API_URL=pusher.$BASE_DOMAIN
ARG BASE_DOMAIN=workadventure.localhost
ARG JITSI_PRIVATE_MODE
ARG JITSI_URL
ARG START_ROOM_URL
ARG STUN_SERVER
ARG TURN_PASSWORD
ARG TURN_SERVER
ARG TURN_USER
ARG UPLOADER_URL=uploader.$BASE_DOMAIN
RUN ./templater.sh
RUN API_URL=$API_URL UPLOADER_URL=$UPLOADER_URL ADMIN_URL=$ADMIN_URL START_ROOM_URL=$START_ROOM_URL \
JITSI_URL=$JITSI_URL JITSI_PRIVATE_MODE=$JITSI_PRIVATE_MODE \
STUN_SERVER=$STUN_SERVER TURN_SERVER=$TURN_SERVER TURN_USER=$TURN_USER TURN_PASSWORD=$TURN_PASSWORD \
yarn run build
# final production image
FROM nginx:mainline-alpine
COPY front/nginx-vhost.conf /etc/nginx/conf.d/default.conf
COPY --from=builder2 /usr/src/dist /usr/share/nginx/html

14
front/nginx-vhost.conf Normal file
View File

@ -0,0 +1,14 @@
server {
listen 8000;
listen [::]:8000;
server_name localhost;
location / {
root /usr/share/nginx/html;
index index.html index.htm;
}
location ~ ^/[@_]/ {
try_files $uri $uri/ /index.html;
}
}

6
pusher/Dockerfile
View File

@ -1,11 +1,11 @@
# protobuf build # protobuf build
FROM node:14.15.4-buster-slim@sha256:cbae886186467bbfd274b82a234a1cdfbbd31201c2a6ee63a6893eefcf3c6e76 as builder FROM node:14-buster-slim as builder
WORKDIR /usr/src WORKDIR /usr/src
COPY messages . COPY messages .
RUN yarn install && yarn proto RUN yarn install && yarn proto
# typescript build # typescript build
FROM node:14.15.4-buster-slim@sha256:cbae886186467bbfd274b82a234a1cdfbbd31201c2a6ee63a6893eefcf3c6e76 as builder2 FROM node:14-buster-slim as builder2
WORKDIR /usr/src WORKDIR /usr/src
COPY pusher/yarn.lock pusher/package.json ./ COPY pusher/yarn.lock pusher/package.json ./
RUN yarn install RUN yarn install
@ -15,7 +15,7 @@ ENV NODE_ENV=production
RUN yarn run tsc RUN yarn run tsc
# final production image # final production image
FROM node:14.15.4-buster-slim@sha256:cbae886186467bbfd274b82a234a1cdfbbd31201c2a6ee63a6893eefcf3c6e76 FROM node:14-buster-slim
WORKDIR /usr/src WORKDIR /usr/src
COPY pusher/yarn.lock pusher/package.json ./ COPY pusher/yarn.lock pusher/package.json ./
COPY --from=builder2 /usr/src/dist /usr/src/dist COPY --from=builder2 /usr/src/dist /usr/src/dist