update base images

This commit is contained in:
chandi 2023-03-21 12:49:00 +01:00
parent 2a0cd91e72
commit 0766a4033c
6 changed files with 17 additions and 15 deletions

View File

@ -1,4 +1,4 @@
FROM node:14.19.1-bullseye-slim AS builder FROM node:16-bullseye-slim AS builder
COPY ./bbb-pads /bbb-pads COPY ./bbb-pads /bbb-pads
RUN cd /bbb-pads && rm -r .git && npm install --production RUN cd /bbb-pads && rm -r .git && npm install --production
@ -7,7 +7,7 @@ RUN cd /bbb-pads && rm -r .git && npm install --production
RUN chmod 777 /bbb-pads/config RUN chmod 777 /bbb-pads/config
# ------------------------------ # ------------------------------
FROM node:14.19.1-bullseye-slim FROM node:16-bullseye-slim
RUN apt update && apt install -y jq moreutils \ RUN apt update && apt install -y jq moreutils \
&& useradd --uid 2003 --user-group bbb-pads && useradd --uid 2003 --user-group bbb-pads

View File

@ -21,11 +21,14 @@ RUN sed -i "s/VERSION/$TAG_HTML5/" /app/bundle/programs/web.browser/head.html \
# ------------------------------ # ------------------------------
FROM node:14.21.1-alpine FROM node:14-bullseye-slim
RUN apt-get update && apt-get install -y gosu
# add user & group
RUN groupadd -g 2000 meteor \
&& useradd -m -u 2001 -g meteor meteor
RUN addgroup -g 2000 meteor && \
adduser -D -u 2001 -G meteor meteor && \
apk add su-exec
COPY --from=alangecker/bbb-docker-base-java /usr/local/bin/dockerize /usr/local/bin/dockerize COPY --from=alangecker/bbb-docker-base-java /usr/local/bin/dockerize /usr/local/bin/dockerize
COPY --from=builder --chown=meteor:meteor /app/bundle /app COPY --from=builder --chown=meteor:meteor /app/bundle /app
COPY entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh

View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
set -e set -e
cd /app cd /app
@ -39,5 +39,5 @@ fi
dockerize \ dockerize \
-template /app/bbb-html5.yml.tmpl:/app/bbb-html5.yml \ -template /app/bbb-html5.yml.tmpl:/app/bbb-html5.yml \
su-exec meteor \ gosu meteor \
node --max-old-space-size=2048 --max_semi_space_size=128 main.js $PARAM node --max-old-space-size=2048 --max_semi_space_size=128 main.js $PARAM

View File

@ -1,6 +1,5 @@
FROM node:14-alpine AS builder ARG BBB_BUILD_TAG
FROM gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:$BBB_BUILD_TAG AS builder
RUN apk add subversion git
# -------------------- # --------------------

View File

@ -1,4 +1,4 @@
FROM node:14.18.3-bullseye-slim AS builder FROM node:16-bullseye-slim AS builder
RUN apt-get update && apt-get install -y git wget RUN apt-get update && apt-get install -y git wget
@ -12,7 +12,7 @@ RUN cd /bbb-webhooks && npm install --production
RUN chmod 777 /bbb-webhooks/config RUN chmod 777 /bbb-webhooks/config
# ------------------------------ # ------------------------------
FROM node:14.18.3-bullseye-slim FROM node:16-bullseye-slim
RUN useradd --uid 2004 --user-group bbb-webhooks RUN useradd --uid 2004 --user-group bbb-webhooks
COPY --from=builder /usr/bin/yq /usr/bin/yq COPY --from=builder /usr/bin/yq /usr/bin/yq

View File

@ -23,12 +23,12 @@ RUN cd /app \
# ============================= # =============================
FROM node:14.19.1-bullseye-slim FROM node:16-bullseye-slim
RUN useradd --uid 2004 --user-group webrtc-sfu RUN useradd --uid 2004 --user-group webrtc-sfu
ENV NODE_ENV production ENV NODE_ENV production
COPY --from=builder /app /app COPY --from=builder /app /app
RUN chown -R webrtc-sfu:webrtc-sfu /app/config RUN mkdir /home/webrtc-sfu && chown -R webrtc-sfu:webrtc-sfu /app/config /home/webrtc-sfu
USER webrtc-sfu USER webrtc-sfu
WORKDIR /app WORKDIR /app