From 5d326709b6dbeaf61a6c42d4525e26465a96d8f0 Mon Sep 17 00:00:00 2001 From: chandi Date: Sun, 8 May 2022 19:45:59 +0200 Subject: [PATCH] publish images --- docker-compose.tmpl.yml | 14 +++++++++++++- mod/apps-akka/Dockerfile | 2 +- mod/bbb-web/Dockerfile | 4 +--- mod/freeswitch/Dockerfile | 2 +- mod/fsesl-akka/Dockerfile | 2 +- mod/html5/Dockerfile | 2 +- scripts/generate-compose | 4 ++++ scripts/setup | 3 --- 8 files changed, 22 insertions(+), 11 deletions(-) diff --git a/docker-compose.tmpl.yml b/docker-compose.tmpl.yml index 03aadcc..747e551 100644 --- a/docker-compose.tmpl.yml +++ b/docker-compose.tmpl.yml @@ -12,7 +12,7 @@ x-html5-backend: &html5backend args: BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }} TAG_HTML5: {{ .Env.TAG_HTML5 }} - image: bbb-html5 + image: alangecker/bbb-docker-html5:{{ .Env.TAG_HTML5 }} restart: unless-stopped depends_on: - redis @@ -48,6 +48,7 @@ services: BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }} TAG_COMMON_MESSAGE: {{ .Env.TAG_COMMON_MESSAGE }} TAG_BBB_WEB: {{ .Env.TAG_BBB_WEB }} + image: alangecker/bbb-docker-web:{{ .Env.TAG_BBB_WEB }} restart: unless-stopped depends_on: - redis @@ -106,6 +107,7 @@ services: context: mod/freeswitch args: TAG_FS_CONFIG: {{ .Env.TAG_FS_CONFIG }} + image: alangecker/bbb-docker-freeswitch:{{ .Env.TAG_FS_CONFIG }} restart: unless-stopped cap_add: - IPC_LOCK @@ -134,6 +136,7 @@ services: context: mod/nginx args: TAG_LEARNING_DASHBOARD: {{ .Env.TAG_LEARNING_DASHBOARD }} + image: alangecker/bbb-docker-nginx:1.21-{{ .Env.TAG_PLAYBACK }}-{{ .Env.TAG_LEARNING_DASHBOARD }} restart: unless-stopped depends_on: - etherpad @@ -153,6 +156,7 @@ services: etherpad: build: mod/etherpad + image: alangecker/bbb-docker-etherpad:1.8.18 restart: unless-stopped depends_on: - redis @@ -164,6 +168,7 @@ services: bbb-pads: build: mod/bbb-pads + image: alangecker/bbb-docker-pads:{{ .Env.TAG_PADS }} restart: unless-stopped depends_on: - redis @@ -216,6 +221,7 @@ services: context: mod/webrtc-sfu args: BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }} + image: alangecker/bbb-docker-webrtc-sfu:{{ .Env.TAG_WEBRTC_SFU }} restart: unless-stopped depends_on: - redis @@ -248,6 +254,7 @@ services: BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }} TAG_COMMON_MESSAGE: {{ .Env.TAG_COMMON_MESSAGE }} TAG_FSESL_AKKA: {{ .Env.TAG_FSESL_AKKA }} + image: alangecker/bbb-docker-fsesl-akka:{{ .Env.TAG_FSESL_AKKA }} restart: unless-stopped depends_on: - redis @@ -265,6 +272,7 @@ services: BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }} TAG_COMMON_MESSAGE: {{ .Env.TAG_COMMON_MESSAGE }} TAG_APPS_AKKA: {{ .Env.TAG_APPS_AKKA }} + image: alangecker/bbb-docker-apps-akka:{{ .Env.TAG_APPS_AKKA }} restart: unless-stopped depends_on: - redis @@ -279,6 +287,7 @@ services: jodconverter: build: mod/jodconverter + image: alangecker/bbb-docker-jodconverter:latest restart: unless-stopped tmpfs: - /tmp @@ -292,6 +301,7 @@ services: periodic: build: mod/periodic + image: alangecker/bbb-docker-periodic:v2.5.0-rc.1 restart: unless-stopped depends_on: - mongodb @@ -317,6 +327,7 @@ services: args: BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }} TAG_RECORDINGS: {{ .Env.TAG_RECORDINGS }} + image: alangecker/bbb-docker-recordings:{{ .Env.BBB_BUILD_TAG }} restart: unless-stopped depends_on: - redis @@ -340,6 +351,7 @@ services: # webhooks webhooks: build: mod/webhooks + image: alangecker/bbb-docker-webhooks:{{ .Env.TAG_WEBHOOKS }} restart: unless-stopped environment: DOMAIN: ${DOMAIN} diff --git a/mod/apps-akka/Dockerfile b/mod/apps-akka/Dockerfile index 3d260b4..3ad648e 100644 --- a/mod/apps-akka/Dockerfile +++ b/mod/apps-akka/Dockerfile @@ -23,7 +23,7 @@ RUN cd /source \ # =================================================== -FROM bbb-docker-base-java +FROM alangecker/bbb-docker-base-java COPY --from=builder /bbb-apps-akka-0.0.4 /bbb-apps-akka COPY bbb-apps-akka.conf /etc/bigbluebutton/bbb-apps-akka.conf.tmpl diff --git a/mod/bbb-web/Dockerfile b/mod/bbb-web/Dockerfile index f231b39..b27e0cc 100644 --- a/mod/bbb-web/Dockerfile +++ b/mod/bbb-web/Dockerfile @@ -36,9 +36,7 @@ RUN unzip -q /bbb-web/build/libs/bigbluebutton-0.10.0.war -d /dist # =================================================== -FROM bbb-docker-base-java - -COPY --from=bbb-docker-base-java /usr/local/bin/dockerize /usr/local/bin/dockerize +FROM alangecker/bbb-docker-base-java # add blank presentation files and allow conversation to pdf/svg RUN mkdir -p /usr/share/bigbluebutton/blank \ diff --git a/mod/freeswitch/Dockerfile b/mod/freeswitch/Dockerfile index a3f05ba..6480b23 100644 --- a/mod/freeswitch/Dockerfile +++ b/mod/freeswitch/Dockerfile @@ -5,7 +5,7 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends \ subversion curl wget ca-certificates gnupg gnupg2 lsb-release unzip -COPY --from=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 # install freeswitch diff --git a/mod/fsesl-akka/Dockerfile b/mod/fsesl-akka/Dockerfile index 305a386..61494d1 100644 --- a/mod/fsesl-akka/Dockerfile +++ b/mod/fsesl-akka/Dockerfile @@ -27,7 +27,7 @@ RUN unzip /source/target/universal/bbb-fsesl-akka-0.0.2.zip -d / # # =================================================== -FROM bbb-docker-base-java +FROM alangecker/bbb-docker-base-java COPY --from=builder /bbb-fsesl-akka-0.0.2 /bbb-fsesl-akka COPY bbb-fsesl-akka.conf /etc/bigbluebutton/bbb-fsesl-akka.conf.tmpl diff --git a/mod/html5/Dockerfile b/mod/html5/Dockerfile index c5d1add..9364fed 100644 --- a/mod/html5/Dockerfile +++ b/mod/html5/Dockerfile @@ -26,7 +26,7 @@ FROM node:14.19.1-alpine RUN addgroup -g 2000 meteor && \ adduser -D -u 2001 -G meteor meteor && \ apk add su-exec -COPY --from=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 entrypoint.sh /entrypoint.sh COPY bbb-html5.yml /app/bbb-html5.yml.tmpl diff --git a/scripts/generate-compose b/scripts/generate-compose index abdefdd..7beb472 100755 --- a/scripts/generate-compose +++ b/scripts/generate-compose @@ -47,6 +47,10 @@ docker run \ -e TAG_FS_CONFIG=${TAG_FS_CONFIG} \ -e TAG_LEARNING_DASHBOARD=${TAG_LEARNING_DASHBOARD} \ -e TAG_RECORDINGS=${TAG_RECORDINGS} \ + -e TAG_WEBRTC_SFU=${TAG_WEBRTC_SFU} \ + -e TAG_WEBHOOKS=${TAG_WEBHOOKS} \ + -e TAG_PLAYBACK=${TAG_PLAYBACK} \ + -e TAG_PADS=${TAG_PADS} \ -e DEV_MODE=${DEV_MODE:-false} \ -e EXTERNAL_IPv6=${EXTERNAL_IPv6:-} \ -e ENABLE_RECORDING=${ENABLE_RECORDING:-false} \ diff --git a/scripts/setup b/scripts/setup index 014b689..3f4ecdf 100755 --- a/scripts/setup +++ b/scripts/setup @@ -198,9 +198,6 @@ sed -i "s/POSTGRESQL_SECRET=.*/POSTGRESQL_SECRET=$RANDOM_5/" .env ./scripts/generate-compose -echo "building bbb-docker-base-java" -docker build -t bbb-docker-base-java mod/base-java - echo "--------------------------------------------------" echo "configuration file .env got successfully created!" echo ""