Re: Headless mail merge

2022-04-12 Thread Marco Marinello 
Hi everybody,


I've carefully read all of your suggestions and finally decided to go
with odfpy instead.

If you're curious, here's the implementation:
https://git.libreoffice.org/infra/mc-tooling/+/8d1e2135704ba8cdbed7223458d49ebec84928b7%5E%21/#F0


Thanks again,

All the best,

Marco


Il 06/04/22 12:47, Marco Marinello ha scritto:
> Hi all,
>
>
> what's the easiest way to perform a mail-merge with libreoffice by
> passing arguments from an automated script? Should I use UNO?
>
> Do you have any reference?
>
>
> Thanks in advance,
>
> Best,
>
> Marco
>
>
>

Re: Headless mail merge

2022-04-06 Thread Marco Marinello 
Hi Andew,


thank you for your answer. I'll take a look at the links you pointed to.

The idea is, starting from a template in odt/doc/docx, to "fill in the
gaps" and save the filled document. Is there any other way rather than
mail merge?


All the best,

Marco


Il 06/04/22 18:19, Andrew Pitonyak ha scritto:
>
> I had planned on documenting how to do this some years back and
> AndrewBase.odt, and my only notes say that I should document the new
> e-mail merge API released in OpenOffice.org version 2.01; that was a
> long time ago. 
>
> I generally do not have reason to use mailmerge, but did you want to
> send something by email or to print? 
>
> Someone posted a question about using mail merge with UNO in Basic here: 
>
> https://ask.libreoffice.org/t/syntax-for-using-spreadsheet-as-data-source-in-emailmerge-macro/24831
>
> From my perspective, the fact that they used the
> server com.sun.star.text.MailMerge is useful in that it provides a
> pointer to the service to look at. 
>
> Another request for help here: 
>
> https://forum.openoffice.org/en/forum/viewtopic.php?f=20=59312
>
> No answer; sadly. 
>
> In AndrewMacro.odt, there is an example that merges a bunch of
> documents from a directory into a single document and it is listed as
> being related to "mail merge", so I assume that somebody had run a
> mail merge and this processes created many documents. But again, I
> have not run a mail merge in many years. 
>
> On Wednesday, April 06, 2022 06:47 EDT, Marco Marinello
>  wrote:
>  
>> Hi all,
>>
>>
>> what's the easiest way to perform a mail-merge with libreoffice by
>> passing arguments from an automated script? Should I use UNO?
>>
>> Do you have any reference?
>>
>>
>> Thanks in advance,
>>
>> Best,
>>
>> Marco
>>
>>  
>
>
>  

Headless mail merge

2022-04-06 Thread Marco Marinello 
Hi all,


what's the easiest way to perform a mail-merge with libreoffice by
passing arguments from an automated script? Should I use UNO?

Do you have any reference?


Thanks in advance,

Best,

Marco

Building debian package without version in the name

2022-02-21 Thread Marco Marinello 
Hi,


as far as I can tell, both debian packages released on libreoffice.org
and those one can build from the core repo by passing
/--with-package-format=deb/ contains in their name also the version:

$ apt-cache show libreoffice7.2
Package: libreoffice7.2
Status: install ok installed
Installed-Size: 3680
Maintainer: The Document Foundation
Architecture: amd64
Version: 7.2.5.2-2
Depends: libreoffice7.2-ure (>= 7.2.5.2), libreoffice7.2-ure (<= 7.2.5.2-2), 
libobasis7.2-core (>= 7.2.5.2), libobasis7.2-core (<= 7.2.5.2-2), 
libobasis7.2-images (>= 7.2.5.2), libobasis7.2-images (<= 7.2.5.2-2)
Description: Brand module for LibreOffice 7.2.5.2
 Copyright: 2021 The Document Foundation
 Brand module for LibreOffice 7.2
Description-md5: 40c112f2d805d5e543e71b105e2fe2fc

In opposite to that, the distro-provided package (Debian in my case)
does not contain the version:

Package: libreoffice
Version: 1:6.1.5-3+deb10u4
Installed-Size: 93
Maintainer: Debian LibreOffice Maintainers 
Architecture: amd64

Since I'd like to provide via private repos a recent version of LO, is
there a way to build the DEB packages without the version in the name?


Thanks in advance,

ATB

Marco

Re: Request for information about LibreOffice for university project

2021-05-27 Thread Marco Marinello 
Dear Alberto,


please, try to post here on the ML a list of questions you would ask
regarding our development process so that (different) devs and
contributors can try to answer as best as we can.


Nice project, indeed (is it a thesis?)

All the best,

Marco Marinello


Il 27/05/21 21:04, Alberto ha scritto:
>
> Greetings,
>
>
> My name is Alberto Dorizza and I’m writing for a group of Software
> Engineering students at University of Padova (Italy) conducting
> research that involves the analysis of the development process of a
> software of our choosing.
>
> Therefore we would like to conduct this research on LibreOffice, on
> which we thought you might be able to enlighten us.
>
> Our research is based on a few points, that is the focus and purpose
> of this software, the development strategies and models applied, the
> software requirements, the update commit frequency and if possible a
> history of such updates.
>
> We want to enforce the purely informative purpose of this research.
>
> We are very much open to fix an appointment with yourself, or with
> whom this might be of concern, to discuss in more details our
> requests, if needed.
>
> Should our project meet your interest, we would respectfully ask of
> you a rather quick response so that we might close in well on our
> strict deadline.
>
> I give you our utmost thanks for your helpfulness.
>
>
> Sincerely,
>
> Alberto Dorizza
>
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Feature request] Convert spreadsheets to SQL queries

2021-05-26 Thread Marco Marinello 
Hi Chintan,


I think there are other ways you can use, rather than having this
feature implemented in LO. I sightly remember that software like
PHPMyAdmin (for MariaDB/MySQL) have the feature to import from a CSV
file, which you can create by exporting your spreadsheet from LO.

Otherwise you can always go with some scripting using Python or other
languages, always beginning from the CSV.


Best,

Marco


Il 25/05/21 17:17, Chintan from Rebhu ha scritto:
> Hello devs, users, and lurkers
>
> I frequently find myself copying data from old spreadsheets to SQL.
>
> Would it be possible to convert spreadsheets to SQL queries?
>
> -- 
> Chintan Mishra
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Is there any effort or discussion yet about collaborative use of libreoffice applications?

2020-12-14 Thread Marco Marinello - Mailing lists 
Dear Stu,


don't worry. Marc really got a point but probably Tor believes you're
not able to declare a variable in Javascript and tries to sell you
Collabora products :-).

There is *official* documentation about how to build, configure and run
LibreOffice Online here:
https://wiki.documentfoundation.org/Development/LibreOffice_Online .

LibreOffice Online is substantially an in-browser wrapper of the core of
LibreOffice so that you have the same stability/capabilities that you
have in the desktop version, online. Collaborative editing is supported
and pretty well-working.

You can integrate it into your application using the WOPI protocol.

Feel free to ask in the ML if you have any problem compiling or running
LOOL.


Best,

Marco


Il 13/12/20 13:56, Stu ha scritto:
> Well, I wasn't trying to start a flamewar or a drama episode or
> anything. I didn't know collabawhatever was a thing.
> but a) it looks like a commercial product? b) it sounds like they just
> run libreoffice on a web server and project the instance to whoever's
> on that webpage. c) somebody has to supply the 'cloud' that it runs on.
>
> I'm a big fan of fat clients. ms word and libre office will always be
> superior to google docs (in my opinion only obviously) because it runs
> locally on my machine. What I was getting at was a way to make a fat
> client collaborative.
>
> But if there's no interest, I'll drop it.
>
> Thanks for the info.
>
>
>
> On Sat, Dec 12, 2020 at 9:07 AM Marc Roos  > wrote:
>
>  
> :) No but is really a question. I want to try a bit this libre office
> online and I am not even able to get a simple test environment
> running
> that creates a odt file that I can edit from multiple clients.
> Even the manual of libre online online ~50% writing about other
> products/services.
>
>
>
>
> -Original Message-
> Cc: nixo; libreoffice
> Subject: Re: Is there any effort or discussion yet about
> collaborative
> use of libreoffice applications?
>
>
>
>         Why do people send collabra office stuff on a libre office
> mailing
>         list The question is clearly about libre office.
>
>
>
> Oh sorry then. I will now go back in the corner to enjoy my popcorn.
>
> --tml
>
>
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Online literature

2020-10-22 Thread Marco Marinello - Mailing lists 
Hi all,


I'm currently looking for papers or other publications regarding
LibreOffice Online and his applications.

If you know any, please let me know.


Thank you,

Marco

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: docker/Debian docker/Ubuntu

2020-05-20 Thread Marco Marinello (via logerrit) 
 docker/Debian |   33 -
 docker/Ubuntu |   35 +++
 2 files changed, 35 insertions(+), 33 deletions(-)

New commits:
commit 16f72821bd7872497d132bd27a272218c753e0b6
Author: Marco Marinello 
AuthorDate: Fri May 15 10:01:38 2020 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed May 20 08:35:03 2020 +0200

Enhance docker build system: reduce created layers

Signed-off-by: Marco Marinello 
Change-Id: If12a84b3adb82dad3bf7ef7ea423e8bdfac1650e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94261
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/docker/Debian b/docker/Debian
index b43bc4a32..58cc72142 100644
--- a/docker/Debian
+++ b/docker/Debian
@@ -7,15 +7,15 @@
 FROM debian:stable
 
 # get the latest fixes
-RUN apt-get update
-
 # install LibreOffice run-time dependencies
 # install adduser, findutils, openssl and cpio that we need later
 # install an editor
-RUN apt-get -y install locales-all libpng16-16 fontconfig adduser cpio 
findutils nano libpoco-dev libcap2-bin openssl inotify-tools procps libubsan0 
libubsan1 openssh-client
-
 # tdf#117557 - Add CJK Fonts to LibreOffice Online Docker Image
-RUN apt-get -y install fonts-wqy-zenhei fonts-wqy-microhei 
fonts-droid-fallback fonts-noto-cjk
+RUN apt-get update && \
+apt-get -y install locales-all libpng16-16 fontconfig adduser cpio \
+   findutils nano libpoco-dev libcap2-bin openssl inotify-tools \
+   procps libubsan0 libubsan1 openssh-client fonts-wqy-zenhei \
+   fonts-wqy-microhei fonts-droid-fallback fonts-noto-cjk
 
 # copy freshly built LibreOffice master and LibreOffice Online master with 
latest translations
 COPY /instdir /
@@ -24,18 +24,18 @@ COPY /instdir /
 COPY /scripts/run-lool.sh /
 
 # set up LibreOffice Online (normally done by postinstall script of package)
-RUN setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
-RUN adduser --quiet --system --group --home /opt/lool lool
-RUN mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd
-RUN rm -rf /var/cache/loolwsd/*
-RUN rm -rf /opt/lool
-RUN mkdir -p /opt/lool/child-roots
-RUN loolwsd-systemplate-setup /opt/lool/systemplate /opt/libreoffice 
>/dev/null 2>&1
-RUN touch /var/log/loolwsd.log
 # Fix permissions
-RUN chown lool:lool /var/log/loolwsd.log
-RUN chown -R lool:lool /opt/
-RUN chown -R lool:lool /etc/loolwsd
+RUN setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit && \
+adduser --quiet --system --group --home /opt/lool lool && \
+mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd && \
+rm -rf /var/cache/loolwsd/* && \
+rm -rf /opt/lool && \
+mkdir -p /opt/lool/child-roots && \
+loolwsd-systemplate-setup /opt/lool/systemplate /opt/libreoffice 
>/dev/null 2>&1 && \
+touch /var/log/loolwsd.log && \
+chown lool:lool /var/log/loolwsd.log && \
+chown -R lool:lool /opt/ && \
+chown -R lool:lool /etc/loolwsd
 
 EXPOSE 9980
 
@@ -43,4 +43,3 @@ EXPOSE 9980
 USER 101
 
 CMD bash /run-lool.sh
-
diff --git a/docker/Ubuntu b/docker/Ubuntu
index 070826bf1..d0685b246 100644
--- a/docker/Ubuntu
+++ b/docker/Ubuntu
@@ -7,15 +7,18 @@
 FROM ubuntu:18.04
 
 # refresh repos otherwise installations later may fail
-RUN apt-get update
-
 # install LibreOffice run-time dependencies
 # install adduser, findutils, openssl and cpio that we need later
 # install an editor
-RUN apt-get -y install locales-all libpng16-16 fontconfig adduser cpio 
findutils nano libpocoxml50 libpocoutil50 libpoconetssl50 libpoconet50 
libpocojson50 libpocofoundation50 libpococrypto50 libcap2-bin openssl 
openssh-client inotify-tools procps libxcb-shm0 libxcb-render0 libxrender1 
libxext6
-
 # tdf#117557 - Add CJK Fonts to LibreOffice Online Docker Image
-RUN apt-get -y install fonts-wqy-zenhei fonts-wqy-microhei 
fonts-droid-fallback fonts-noto-cjk
+RUN apt-get update && \
+apt-get -y install locales-all libpng16-16 fontconfig adduser cpio \
+   findutils nano libpocoxml50 libpocoutil50 libpoconetssl50 \
+   libpoconet50 libpocojson50 libpocofoundation50 libpococrypto50 \
+   libcap2-bin openssl openssh-client inotify-tools procps \
+   libxcb-shm0 libxcb-render0 libxrender1 libxext6 \
+   fonts-wqy-zenhei fonts-wqy-microhei fonts-droid-fallback \
+   fonts-noto-cjk
 
 # copy freshly built LibreOffice master and LibreOffice Online master with 
latest translations
 COPY /instdir /
@@ -24,18 +27,18 @@ COPY /instdir /
 COPY /scripts/run-lool.sh /
 
 # set up LibreOffice Online (normally done by postinstall script of package)
-RUN setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
-RUN adduser --qu

[Libreoffice-commits] online.git: docker/Debian docker/Dockerfile docker/l10n-docker-nightly.sh docker/Ubuntu

2020-05-14 Thread Marco Marinello (via logerrit) 
 docker/Debian |   46 ++
 docker/l10n-docker-nightly.sh |   23 ++---
 2 files changed, 66 insertions(+), 3 deletions(-)

New commits:
commit 607ddbff466d145d0dcf87b2759c7e4d02b28f1d
Author: Marco Marinello 
AuthorDate: Fri May 8 12:34:48 2020 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu May 14 10:08:56 2020 +0200

Enhance build system: support multiple OS as host and pull the image before 
build

Change-Id: Ic9875dd1aa49335df83cc6a8492144450f725f31
Signed-off-by: Marco Marinello 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92665
Tested-by: Samuel Mehrbrodt 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/docker/Debian b/docker/Debian
new file mode 100644
index 0..b43bc4a32
--- /dev/null
+++ b/docker/Debian
@@ -0,0 +1,46 @@
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+FROM debian:stable
+
+# get the latest fixes
+RUN apt-get update
+
+# install LibreOffice run-time dependencies
+# install adduser, findutils, openssl and cpio that we need later
+# install an editor
+RUN apt-get -y install locales-all libpng16-16 fontconfig adduser cpio 
findutils nano libpoco-dev libcap2-bin openssl inotify-tools procps libubsan0 
libubsan1 openssh-client
+
+# tdf#117557 - Add CJK Fonts to LibreOffice Online Docker Image
+RUN apt-get -y install fonts-wqy-zenhei fonts-wqy-microhei 
fonts-droid-fallback fonts-noto-cjk
+
+# copy freshly built LibreOffice master and LibreOffice Online master with 
latest translations
+COPY /instdir /
+
+# copy the shell script which can start LibreOffice Online (loolwsd)
+COPY /scripts/run-lool.sh /
+
+# set up LibreOffice Online (normally done by postinstall script of package)
+RUN setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
+RUN adduser --quiet --system --group --home /opt/lool lool
+RUN mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd
+RUN rm -rf /var/cache/loolwsd/*
+RUN rm -rf /opt/lool
+RUN mkdir -p /opt/lool/child-roots
+RUN loolwsd-systemplate-setup /opt/lool/systemplate /opt/libreoffice 
>/dev/null 2>&1
+RUN touch /var/log/loolwsd.log
+# Fix permissions
+RUN chown lool:lool /var/log/loolwsd.log
+RUN chown -R lool:lool /opt/
+RUN chown -R lool:lool /etc/loolwsd
+
+EXPOSE 9980
+
+# switch to lool user (use numeric user id to be compatible with Kubernetes 
Pod Security Policies)
+USER 101
+
+CMD bash /run-lool.sh
+
diff --git a/docker/Dockerfile b/docker/Ubuntu
similarity index 100%
rename from docker/Dockerfile
rename to docker/Ubuntu
diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh
index 9bbb4ad4a..e921a4283 100755
--- a/docker/l10n-docker-nightly.sh
+++ b/docker/l10n-docker-nightly.sh
@@ -51,9 +51,22 @@ if [ -z "$LIBREOFFICE_BUILD_TARGET" ]; then
 fi;
 echo "LibreOffice build target: '$LIBREOFFICE_BUILD_TARGET'"
 
-# do everything in the builddir
+
 SRCDIR=$(realpath `dirname $0`)
-INSTDIR="$SRCDIR/instdir"
+
+if [ -z "$(lsb_release -si)" ]; then
+   echo "WARNING: Unable to determine your distribution"
+   echo "(Is lsb_release installed?)"
+   echo "Using Ubuntu Dockerfile."
+   HOST_OS="Ubuntu"
+else
+   HOST_OS=$(lsb_release -si)
+fi
+if ! [ -e "$HOST_OS" ]; then
+  echo "There is no suitable Dockerfile for your host system."
+  echo "Please fix this problem and re-run $0"
+  exit 1
+fi
 BUILDDIR="$SRCDIR/builddir"
 
 mkdir -p "$BUILDDIR"
@@ -104,7 +117,11 @@ cp -a libreoffice/instdir "$INSTDIR"/opt/libreoffice
 # Create new docker image
 if [ -z "$NO_DOCKER_IMAGE" ]; then
   cd "$SRCDIR"
-  docker build --no-cache -t $DOCKER_HUB_REPO:$DOCKER_HUB_TAG . || exit 1
+
+  # Pull the image first to be sure we're using the latest available
+  docker pull $(grep "FROM " $HOST_OS | cut -d ' ' -f 2)
+
+  docker build --no-cache -t $DOCKER_HUB_REPO:$DOCKER_HUB_TAG -f $HOST_OS . || 
exit 1
   if [ -z "$NO_DOCKER_PUSH" ]; then
 docker push $DOCKER_HUB_REPO:$DOCKER_HUB_TAG || exit 1
   fi;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: INSTALL

2020-05-05 Thread Marco Marinello (via logerrit) 
 INSTALL |   30 +-
 1 file changed, 29 insertions(+), 1 deletion(-)

New commits:
commit cf0cd0755faf4fab616df2066c74c182289dda48
Author: Marco Marinello 
AuthorDate: Wed Apr 22 09:27:56 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Tue May 5 22:24:45 2020 +0200

Start writing something serious in the INSTALL file

Signed-off-by: Marco Marinello 
Change-Id: Iabe21ce53ab36c9d0afab6abd4da8831ea2a3b3f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92668
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Thorsten Behrens 

diff --git a/INSTALL b/INSTALL
index adff4aef0..81e211914 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1,29 @@
-Left as an exercise to the reader.
+We strongly discourage to build both core and online as superuser.
+Therefore, make sure you have a non-privileged user which can
+run /sbin/setcap with sudo without password.
+Make even sure that the user you're going to use owns the whole tree
+(the simplest way is to directly clone with the user user for build).
+
+To build LibreOffice Online you'll need to compile LibreOffice core first:
+1. Clone core repository
+   git clone https://git.libreoffice.org/core
+2. ./autogen.sh --with-distro=LibreOfficeOnline
+3. make
+
+
+When you have a working build of LOKit you can build LOOL.
+
+1. Clone this repository
+   git clone https://git.libreoffice.org/online
+2. ./autogen.sh
+3. ./configure --prefix=/usr \
+   --sysconfdir=/etc \
+   --localstatedir=/var \
+   --enable-silent-rules \
+   --with-lokit-path=YOUR_INCLUDE_PATH_TO_CORE_BUILD \
+   --with-lo-path=/opt/libreoffice
+4. make
+
+
+If you're interested in building a docker image, refer to the
+`docker` directory and to 
https://wiki.documentfoundation.org/Development/BuildingOnline
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Marco Marinello's license statement

2020-04-23 Thread Marco Marinello 
All of my past & future contributions to LibreOffice may be licensed
under the MPLv2/LGPLv3+ dual license.


Marco Marinello

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

LOOL brandProdcutName definition

2020-04-20 Thread Marco Marinello 
Hi all and sorry for disturbing.


Does anybody know how am I supposed to set the `brandProdcutName`
variable while building the online part of LOOL?


Thanks

ATB

Marco

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: docker/l10n-docker-nightly.sh

2020-03-01 Thread Marco Marinello (via logerrit) 
 docker/l10n-docker-nightly.sh |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 11c12a2729dcaccdcc84bc94a1a250fa124159c2
Author: Marco Marinello 
AuthorDate: Tue Feb 25 21:46:04 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Mar 2 01:53:29 2020 +0100

Variabilize online git source

Signed-off-by: Marco Marinello 
Change-Id: If8f9103972952b98193ca6d1501844422b8aae54
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89483
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh
index 598282e94..96d5a9be8 100755
--- a/docker/l10n-docker-nightly.sh
+++ b/docker/l10n-docker-nightly.sh
@@ -9,6 +9,7 @@
 # * DOCKER_HUB_REPO - which Docker Hub repo to use
 # * DOCKER_HUB_TAG  - which Docker Hub tag to create
 # * LIBREOFFICE_BRANCH  - which branch to build in core
+# * LIBREOFFICE_ONLINE_REPO - which git repo to clone online from
 # * LIBREOFFICE_ONLINE_BRANCH - which branch to build in online
 # * LIBREOFFICE_BUILD_TARGET - which make target to run (in core repo)
 # * ONLINE_EXTRA_BUILD_OPTIONS - extra build options for online
@@ -47,6 +48,11 @@ if [ -z "$LIBREOFFICE_BUILD_TARGET" ]; then
 fi;
 echo "LibreOffice build target: '$LIBREOFFICE_BUILD_TARGET'"
 
+if [ -z "$LIBREOFFICE_ONLINE_REPO" ]; then
+  LIBREOFFICE_ONLINE_REPO="https://git.libreoffice.org/online;
+fi;
+echo "LibreOffice build target: '$LIBREOFFICE_BUILD_TARGET'"
+
 # do everything in the builddir
 SRCDIR=$(realpath `dirname $0`)
 INSTDIR="$SRCDIR/instdir"
@@ -69,7 +75,7 @@ fi
 
 # online repo
 if test ! -d online ; then
-git clone https://git.libreoffice.org/online online || exit 1
+git clone "$LIBREOFFICE_ONLINE_REPO" online || exit 1
 fi
 
 ( cd online && git fetch --all && git checkout -f $LIBREOFFICE_ONLINE_BRANCH 
&& git clean -f -d && git pull -r ) || exit 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/README

2020-02-25 Thread Marco Marinello (via logerrit) 
 docker/README |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 0326037cbfcea000daaa52dcf2da1b571144cdd0
Author: Marco Marinello 
AuthorDate: Tue Feb 25 21:40:30 2020 +0100
Commit: Michael Meeks 
CommitDate: Tue Feb 25 22:45:43 2020 +0100

Add a README for docker directory

Signed-off-by: Marco Marinello 
Change-Id: I0cc9da9945763c48afd01ea231d9dfb5bb384d71
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89482
Tested-by: Michael Meeks 
Reviewed-by: Michael Meeks 

diff --git a/docker/README b/docker/README
new file mode 100644
index 0..36dbb7180
--- /dev/null
+++ b/docker/README
@@ -0,0 +1,10 @@
+LibreOffice Online docker
+
+This directory contains everything needed to compile a
+working docker container with LOOL.
+
+The provided l10n-docker-nightly.sh provides an automatic
+way to compile it with nightly translations.
+
+Further docs:
+https://wiki.documentfoundation.org/Development/BuildingOnline
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/l10n-docker-nightly.sh

2020-02-20 Thread Marco Marinello (via logerrit) 
 docker/l10n-docker-nightly.sh |4 
 1 file changed, 4 insertions(+)

New commits:
commit fdba30ea4d8d1070e2a1ad8c2fc0d5c44e011dfb
Author: Marco Marinello 
AuthorDate: Thu Feb 20 10:45:14 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Feb 20 14:07:30 2020 +0100

Add more flags to docker compilation

Signed-off-by: Marco Marinello 
Change-Id: Ib5a49613ed36eec0d8ab8178b13e302cd5d8da4e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89080
Tested-by: Samuel Mehrbrodt 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh
index 4bb588823..598282e94 100755
--- a/docker/l10n-docker-nightly.sh
+++ b/docker/l10n-docker-nightly.sh
@@ -13,6 +13,7 @@
 # * LIBREOFFICE_BUILD_TARGET - which make target to run (in core repo)
 # * ONLINE_EXTRA_BUILD_OPTIONS - extra build options for online
 # * NO_DOCKER_IMAGE - if set, don't build the docker image itself, just do all 
the preps
+# * NO_DOCKER_PUSH - don't push to docker hub
 
 # check we can sudo without asking a pwd
 echo "Trying if sudo works without a password"
@@ -101,6 +102,9 @@ if [ -z "$NO_DOCKER_IMAGE" ]; then
   cd "$SRCDIR"
   docker build --no-cache -t $DOCKER_HUB_REPO:$DOCKER_HUB_TAG . || exit 1
   docker push $DOCKER_HUB_REPO:$DOCKER_HUB_TAG || exit 1
+  if [ -z "$NO_DOCKER_PUSH" ]; then
+docker push $DOCKER_HUB_REPO:$DOCKER_HUB_TAG || exit 1
+  fi;
 else
   echo "Skipping docker image build"
 fi;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits