Docker GH action: rework for the online monorepo

The separate core repo on gerrit.collaboraoffice.com is gone; what used
to be core is now the engine/ subdir of the online monorepo. Clone
online from Gerrit, drop the separate core clone, and treat
online/engine/ as the engine source and asset root.

Default COLLABORA_ONLINE_REPO to the Gerrit URL (also set explicitly in
the Dockerfile), remove the obsolete CORE_BRANCH variable, extract
prebuilt engine assets into online/engine/, and point --with-lokit-path
at online/engine/include.

Also rename CORE_ASSETS to ENGINE_ASSETS, CORE_BUILD_TARGET to
ENGINE_BUILD_TARGET, and the install path /opt/lokit to
/opt/collaboraoffice across the script, Dockerfile, and README.

This unblocks the nightly docker build, which has been picking up an
out-of-date GitHub mirror of main.

Change-Id: I101955201de40eb416595418eadb0f1012ed068e
Signed-off-by: Andras Timar <[email protected]>

Author: timar

docker/from-source-gh-action/Dockerfile

@@ -1,7 +1,8 @@
 FROM ubuntu:24.04 AS builder
 
-ENV CORE_ASSETS=https://github.com/CollaboraOnline/online/releases/download/for-code-assets/engine-main-assets.tar.gz
+ENV ENGINE_ASSETS=https://github.com/CollaboraOnline/online/releases/download/for-code-assets/engine-main-assets.tar.gz
 ENV BUILDDIR=/build
+ENV COLLABORA_ONLINE_REPO=https://gerrit.collaboraoffice.com/online
 ENV COLLABORA_ONLINE_BRANCH=main
 ENV ONLINE_EXTRA_BUILD_OPTIONS=--enable-experimental
 
@@ -19,7 +20,7 @@ RUN --mount=type=cache,target=/var/cache/apt apt-get update && \
     libcap2-bin python3-lxml libpng-dev libcppunit-dev \
     pkg-config fontconfig snapd chromium-browser \
     rsync curl \
-    # core build dependencies, only those that are needed for LOKit
+    # engine build dependencies
     git build-essential zip ccache autoconf gperf nasm xsltproc flex bison
 
 RUN curl -fsSL https://deb.nodesource.com/setup_20.x -o nodesource_setup.sh && bash nodesource_setup.sh && apt install -y nodejs
@@ -45,7 +46,7 @@ FROM ubuntu:24.04
 ENV LC_CTYPE=C.UTF-8
 
 # refresh repos otherwise installations later may fail
-# install LibreOffice run-time dependencies
+# install engine run-time dependencies
 # install adduser, findutils, openssl and cpio that we need later
 # install tzdata to accept the TZ environment variable
 # install an editor
@@ -60,7 +61,7 @@ RUN apt-get update \
     libnss-wrapper \
     && rm -rf /var/lib/apt/lists/*
 
-# copy freshly built LOKit and Collabora Online
+# copy freshly built engine and Collabora Online
 COPY --from=builder /build/instdir /
 
 # copy the shell script which can start Collabora Online (coolwsd)
@@ -77,8 +78,8 @@ RUN setcap cap_fowner,cap_chown,cap_sys_chroot=ep /usr/bin/coolforkit-caps && \
     chown cool: /opt/cool && \
     chown cool: /opt/cool/child-roots && \
     chown cool: /opt/cool/cache && \
-    fc-cache /opt/lokit/share/fonts/truetype && \
-    coolwsd-systemplate-setup /opt/cool/systemplate /opt/lokit >/dev/null 2>&1 && \
+    fc-cache /opt/collaboraoffice/share/fonts/truetype && \
+    coolwsd-systemplate-setup /opt/cool/systemplate /opt/collaboraoffice >/dev/null 2>&1 && \
     touch /var/log/coolwsd.log && \
     chown cool:cool /var/log/coolwsd.log && \
     chown -R cool:cool /etc/coolwsd && \

docker/from-source-gh-action/README.md

@@ -1,6 +1,6 @@
 This directory contains relevant files for building a docker image from source code using GitHub Actions. The Dockerfile is used to build the image is different from the regular from-source approach as it isolates the build within docker so that the build environment is not dependent on the host environment.
 
-Right now core is not built from source but uses the prebuilt binaries.
+Right now the engine is not built from source but uses the prebuilt binaries.
 
 ## Build locally
 

docker/from-source-gh-action/build.sh

@@ -4,34 +4,30 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # -- Available env vars --
-# * CORE_ASSETS  - which prebuilt assets to build in core
-# * CORE_BRANCH  - which branch to build in core
-# * COLLABORA_ONLINE_REPO - which git repo to clone online from
-# * COLLABORA_ONLINE_BRANCH - which branch to build in online
-# * CORE_BUILD_TARGET - which make target to run (in core repo)
+# * ENGINE_ASSETS  - URL of prebuilt engine assets tarball (skips building engine)
+# * COLLABORA_ONLINE_REPO - which git repo to clone the online monorepo from
+# * COLLABORA_ONLINE_BRANCH - which branch to build
+# * ENGINE_BUILD_TARGET - which make target to run for the engine (when building from source)
 # * ONLINE_EXTRA_BUILD_OPTIONS - extra build options for online
 
-if [ -z "$CORE_ASSETS" ]; then
-  if [ -z "$CORE_BRANCH" ]; then
-    CORE_BRANCH="main"
-  fi;
-  echo "Building core branch '$CORE_BRANCH'"
-else
-  echo "Building from core assets $CORE_ASSETS"
-fi;
-
 if [ -z "$COLLABORA_ONLINE_REPO" ]; then
-  COLLABORA_ONLINE_REPO="https://github.com/CollaboraOnline/online.git"
+  COLLABORA_ONLINE_REPO="https://gerrit.collaboraoffice.com/online"
 fi;
 if [ -z "$COLLABORA_ONLINE_BRANCH" ]; then
   COLLABORA_ONLINE_BRANCH="main"
 fi;
-echo "Building online branch '$COLLABORA_ONLINE_BRANCH' from '$COLLABORA_ONLINE_REPO'"
+echo "Building branch '$COLLABORA_ONLINE_BRANCH' from '$COLLABORA_ONLINE_REPO'"
 
-if [ -z "$CORE_BUILD_TARGET" ]; then
-  CORE_BUILD_TARGET=""
+if [ -z "$ENGINE_ASSETS" ]; then
+  echo "Building engine from source"
+else
+  echo "Using prebuilt engine assets from $ENGINE_ASSETS"
 fi;
-echo "COKit (core) build target: '$CORE_BUILD_TARGET'"
+
+if [ -z "$ENGINE_BUILD_TARGET" ]; then
+  ENGINE_BUILD_TARGET=""
+fi;
+echo "Engine build target: '$ENGINE_BUILD_TARGET'"
 
 SRCDIR=$(realpath `dirname $0`)
 INSTDIR="$SRCDIR/instdir"
@@ -58,49 +54,32 @@ fi
 
 ##### cloning & updating #####
 
-# core repo
-# only if CORE_ASSETS is not set
-if [ -z "$CORE_ASSETS" ]; then
-  if test ! -d core ; then
-    git clone https://gerrit.collaboraoffice.com/core || exit 1
-  fi
-
-  ( cd core && git fetch --all && git checkout $CORE_BRANCH && ./g pull -r ) || exit 1
-else
-  mkdir -p core
-  ( cd core/ && wget "$CORE_ASSETS" -O core-assets.tar.xz && tar -xzf core-assets.tar.xz && rm core-assets.tar.xz) || exit 1
-fi
-
-
-# Clone online repo
+# Clone the online monorepo (engine/ contains the rendering engine)
 if test ! -d online ; then
   git clone --depth=1 --branch $COLLABORA_ONLINE_BRANCH "$COLLABORA_ONLINE_REPO" online || exit 1
 fi
 
 ( cd online && git fetch --all && git checkout -f $COLLABORA_ONLINE_BRANCH && git clean -f -d && git pull -r ) || exit 1
 
-##### COKit (core) #####
-
-# only if core assets are not set
-if [ -z "$CORE_ASSETS" ]; then
-  # build
-  ( cd core && ./autogen.sh --with-distro=CPLinux-LOKit --disable-epm --without-package-format --disable-symbols ) || exit 1
-  ( cd core && make $CORE_BUILD_TARGET ) || exit 1
+##### engine #####
 
-  # copy stuff
-  mkdir -p "$INSTDIR"/opt/
-  cp -a core/instdir "$INSTDIR"/opt/lokit
+if [ -z "$ENGINE_ASSETS" ]; then
+  # build engine from source
+  ( cd online/engine && ./autogen.sh --with-distro=CPLinux-LOKit --disable-epm --without-package-format --disable-symbols ) || exit 1
+  ( cd online/engine && make $ENGINE_BUILD_TARGET ) || exit 1
 else
-  echo "Using prebuilt core assets"
-  mkdir -p "$INSTDIR"/opt/
-  cp -a core/instdir "$INSTDIR"/opt/lokit
+  # drop in prebuilt engine assets
+  ( cd online/engine && wget "$ENGINE_ASSETS" -O engine-assets.tar.xz && tar -xzf engine-assets.tar.xz && rm engine-assets.tar.xz ) || exit 1
 fi
 
+mkdir -p "$INSTDIR"/opt/
+cp -a online/engine/instdir "$INSTDIR"/opt/collaboraoffice
+
 ##### coolwsd & cool #####
 
 # build
 ( cd online && ./autogen.sh ) || exit 1
-( cd online && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-silent-rules --disable-tests --with-lokit-path="$BUILDDIR"/core/include --with-lo-path=/opt/lokit --with-poco-includes=$BUILDDIR/poco/include --with-poco-libs=$BUILDDIR/poco/lib $ONLINE_EXTRA_BUILD_OPTIONS) || exit 1
+( cd online && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-silent-rules --disable-tests --with-lokit-path="$BUILDDIR"/online/engine/include --with-lo-path=/opt/collaboraoffice --with-poco-includes=$BUILDDIR/poco/include --with-poco-libs=$BUILDDIR/poco/lib $ONLINE_EXTRA_BUILD_OPTIONS) || exit 1
 ( cd online && make -j $(nproc)) || exit 1
 
 # copy stuff
@@ -110,7 +89,7 @@ fi
 if test -d online-branding ; then
   if ! which sass &> /dev/null; then npm install -g sass; fi
   cd online-branding
-  ./brand.sh $INSTDIR/opt/lokit $INSTDIR/usr/share/coolwsd/browser/dist CODE # CODE
-  ./brand.sh $INSTDIR/opt/lokit $INSTDIR/usr/share/coolwsd/browser/dist NC-theme-community # Nextcloud Office
+  ./brand.sh $INSTDIR/opt/collaboraoffice $INSTDIR/usr/share/coolwsd/browser/dist CODE # CODE
+  ./brand.sh $INSTDIR/opt/collaboraoffice $INSTDIR/usr/share/coolwsd/browser/dist NC-theme-community # Nextcloud Office
   cd ..
 fi