mirror of
https://github.com/bigbluebutton/docker.git
synced 2025-06-24 14:01:38 +02:00
bbb-export-annotations: update to 3.0.0, drop privileges, reduce docker context
This commit is contained in:
parent
133ec8e29d
commit
b4d2b2043c
@ -177,7 +177,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: mod/bbb-export-annotations
|
context: mod/bbb-export-annotations
|
||||||
additional_contexts:
|
additional_contexts:
|
||||||
bigbluebutton: ./repos/bigbluebutton
|
src: ./repos/bigbluebutton/bbb-export-annotations
|
||||||
image: alangecker/bbb-docker-bbb-export-annotations:{{ .Env.TAG_BBB }}
|
image: alangecker/bbb-docker-bbb-export-annotations:{{ .Env.TAG_BBB }}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
@ -193,6 +193,8 @@ services:
|
|||||||
ipv4_address: 10.7.7.19
|
ipv4_address: 10.7.7.19
|
||||||
volumes:
|
volumes:
|
||||||
- ./data/bigbluebutton:/var/bigbluebutton
|
- ./data/bigbluebutton:/var/bigbluebutton
|
||||||
|
tmpfs:
|
||||||
|
- /tmp
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:7.2-alpine
|
image: redis:7.2-alpine
|
||||||
|
@ -1,24 +1,23 @@
|
|||||||
FROM node:18-bullseye-slim AS builder
|
FROM node:22-bookworm-slim AS builder
|
||||||
|
|
||||||
COPY --from=bigbluebutton /bbb-export-annotations /bbb-export-annotations
|
COPY --from=src / /bbb-export-annotations
|
||||||
RUN cd /bbb-export-annotations && npm ci && npm install
|
RUN cd /bbb-export-annotations && npm ci && npm install
|
||||||
|
|
||||||
# --------------------
|
# --------------------
|
||||||
|
|
||||||
FROM node:18-bullseye-slim
|
FROM node:22-bookworm-slim
|
||||||
|
|
||||||
|
RUN groupadd -g 998 bigbluebutton \
|
||||||
|
&& useradd -m -u 998 -g bigbluebutton bigbluebutton
|
||||||
|
|
||||||
#depends on;
|
|
||||||
#Depends: nodejs,npm,bbb-apps-akka,bbb-web,cairosvg,ghostscript,imagemagick, nodejs (>= 18), nodejs (<< 20)
|
|
||||||
#see repo https://ubuntu.bigbluebutton.org/focal-270/ bigbluebutton-focal main
|
|
||||||
#apt info bbb-export-annotations
|
|
||||||
#missing dependency: poppler-utils for pdftocairo bin -> covert background / original presentation to png
|
|
||||||
RUN apt update && apt install -y \
|
RUN apt update && apt install -y \
|
||||||
nodejs npm cairosvg ghostscript imagemagick nodejs poppler-utils
|
nodejs npm cairosvg ghostscript imagemagick nodejs poppler-utils
|
||||||
# && useradd --uid 2004 --create-home --user-group bbb-export
|
|
||||||
|
|
||||||
COPY --from=builder /bbb-export-annotations /bbb-export-annotations
|
COPY --from=builder /bbb-export-annotations /bbb-export-annotations
|
||||||
#we need acces to volume bigbluebutton!
|
|
||||||
USER root
|
|
||||||
COPY ./config/settings.json /bbb-export-annotations/config/settings.json
|
COPY ./config/settings.json /bbb-export-annotations/config/settings.json
|
||||||
COPY entrypoint.sh /entrypoint.sh
|
|
||||||
ENTRYPOINT /entrypoint.sh
|
USER bigbluebutton
|
||||||
|
WORKDIR /bbb-export-annotations
|
||||||
|
ENV NODE_ENV=production
|
||||||
|
|
||||||
|
ENTRYPOINT npm start
|
||||||
|
@ -4,23 +4,16 @@
|
|||||||
"msgName": "PresAnnStatusMsg"
|
"msgName": "PresAnnStatusMsg"
|
||||||
},
|
},
|
||||||
"shared": {
|
"shared": {
|
||||||
"presDir": "/var/bigbluebutton",
|
|
||||||
"presAnnDropboxDir": "/tmp/pres-ann-dropbox",
|
"presAnnDropboxDir": "/tmp/pres-ann-dropbox",
|
||||||
"cairosvg": "/usr/bin/cairosvg",
|
"cairosvg": "/usr/bin/cairosvg",
|
||||||
"ghostscript": "/usr/bin/gs",
|
"ghostscript": "/usr/bin/gs"
|
||||||
"imagemagick": "/usr/bin/convert",
|
|
||||||
"pdftocairo": "/usr/bin/pdftocairo"
|
|
||||||
},
|
|
||||||
"collector": {
|
|
||||||
"pngWidthRasterizedSlides": 2560
|
|
||||||
},
|
},
|
||||||
"process": {
|
"process": {
|
||||||
"whiteboardTextEncoding": "utf-8",
|
|
||||||
"maxImageWidth": 1440,
|
"maxImageWidth": 1440,
|
||||||
"maxImageHeight": 1080,
|
"maxImageHeight": 1080,
|
||||||
"textScaleFactor": 2,
|
|
||||||
"pointsPerInch": 72,
|
"pointsPerInch": 72,
|
||||||
"pixelsPerInch": 96
|
"pixelsPerInch": 96,
|
||||||
|
"cairoSVGUnsafeFlag": false
|
||||||
},
|
},
|
||||||
"notifier": {
|
"notifier": {
|
||||||
"pod_id": "DEFAULT_PRESENTATION_POD",
|
"pod_id": "DEFAULT_PRESENTATION_POD",
|
||||||
@ -37,5 +30,11 @@
|
|||||||
"queue": "exportJobs",
|
"queue": "exportJobs",
|
||||||
"publish": "to-akka-apps-redis-channel"
|
"publish": "to-akka-apps-redis-channel"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"fonts": {
|
||||||
|
"draw": "/usr/local/share/fonts/CaveatBrush-Regular-2015-09-23.ttf",
|
||||||
|
"sans": "/usr/local/share/fonts/CrimsonPro[wght]-1.003.ttf",
|
||||||
|
"serif": "/usr/local/share/fonts/SourceSansPro-Regular-2.045.ttf",
|
||||||
|
"mono": "/usr/local/share/fonts/SourceCodePro-Regular-2.038.ttf"
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,6 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
cd /bbb-export-annotations
|
|
||||||
export NODE_ENV=production
|
|
||||||
npm start
|
|
Loading…
x
Reference in New Issue
Block a user