summaryrefslogtreecommitdiff
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2020-06-01we don't have to depend on locales-allAndras Timar2-2/+2
... after 15ced64d323e10660e60abbbcfa7386780dcfb4e Change-Id: If08624d4c9614f3616af7f39c7bc636aebaf749b Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95024 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-05-20Enhance docker build system: reduce created layersMarco Marinello2-33/+35
Signed-off-by: Marco Marinello <marinello@libreoffice.org> Change-Id: If12a84b3adb82dad3bf7ef7ea423e8bdfac1650e Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94261 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-05-15set INSTDIR again in and check for dockerfile in proper locationChristian Lohmaier1-1/+2
f'up fix to 607ddbff466d145d0dcf87b2759c7e4d02b28f1d Change-Id: Idbb5191afcb9baab5c58e43e1b2511493491f029 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94291 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-05-14Enhance build system: support multiple OS as host and pull the image before ↵Marco Marinello3-3/+66
build Change-Id: Ic9875dd1aa49335df83cc6a8492144450f725f31 Signed-off-by: Marco Marinello <marinello@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92665 Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-04-24docker: generate the WOPI proof key at container startupAndras Timar2-2/+4
Change-Id: Ic2d8dedcc7aff2a33ef5e26d986a1302fc6941fa Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92851 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-23Proof: add loolwsd-generate-proof-key helper scriptAndras Timar1-0/+1
Change-Id: Ibbd99b6431b1a2992c520d3fad5f52d0770905f6 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92788 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-02Fix log message in docker build scriptSamuel Mehrbrodt1-6/+4
Change-Id: Ifdd931b5ae75137669126ee544d0c9eae9fe7777 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91403 Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-03-23Fix docker script pushing to Docker Hub even when set not toGary Kim1-1/+0
Change-Id: I7506c65b5412f3fd7faadcc387a54b8dfe472650 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90890 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2020-03-05docker: don't start another shell, let the loolwsd process have the PID 1Andras Timar1-1/+1
(Suggested by Ralf Becker) https://github.com/CollaboraOnline/Docker/commit/e024a6c2a34958cbb6e2208652902070b35a9e62#r37648923 Change-Id: Ifa519739686facb41eb9e85b68ebe547e008db34 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90019 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-03-02Variabilize online git sourceMarco Marinello1-1/+7
Signed-off-by: Marco Marinello <marinello@libreoffice.org> Change-Id: If8f9103972952b98193ca6d1501844422b8aae54 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89483 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-02-25Add a README for docker directoryMarco Marinello1-0/+10
Signed-off-by: Marco Marinello <marinello@libreoffice.org> Change-Id: I0cc9da9945763c48afd01ea231d9dfb5bb384d71 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89482 Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2020-02-20Add more flags to docker compilationMarco Marinello1-0/+4
Signed-off-by: Marco Marinello <marinello@libreoffice.org> Change-Id: Ib5a49613ed36eec0d8ab8178b13e302cd5d8da4e Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89080 Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-02-17docker: non-root containerAndras Timar2-6/+11
Change-Id: I30b48fa193fe06ee42752e8ba4883c5221b28924 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88435 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-17docker: expose port 9980 in Dockerfile (useful for inter-container ↵Andras Timar1-0/+1
communication) Change-Id: I9596dfe4909a904d458ed054d71ab4fea45adebe Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88434 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-12-21it's a docker anti-pattern to get the latest fixes during image buildAndras Timar1-2/+2
Change-Id: I9950fb99fdc2f6dad7e2781c6cd663215271ec51 Reviewed-on: https://gerrit.libreoffice.org/78645 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-12-17docker: Allow to build different branches in core+onlineSamuel Mehrbrodt1-3/+9
Change-Id: Ifbd705fc95ae225858ccd582ed2e0150a40f6a93 Reviewed-on: https://gerrit.libreoffice.org/85254 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-12-13With switch to Weblate, downloadpootle.sh script became obsoleteAndras Timar1-2/+0
Change-Id: I85447800a2547d2e9142b59ce60ee3c242e7234d
2019-11-28docker: add missing dependenciesGary Kim1-1/+1
The docker container is missing some dependencies so cannot start properly. Change-Id: Icfa7b318370d331ecf2935f166b3cfb3b57379c8 Reviewed-on: https://gerrit.libreoffice.org/83939 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-10-09One -f should be enoughSamuel Mehrbrodt1-1/+1
Change-Id: Iac8a6cb9fe7a6da41c3d7120bafa62e5847f2c98 Reviewed-on: https://gerrit.libreoffice.org/80510 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-10-09docker: run git clean before git pullAndras Timar1-1/+1
Fixes: https://ci.libreoffice.org/job/lo_online_docker_master/118/console Change-Id: Ib7f228cdbb191f0a397849fb6adf20b37591c1c1
2019-10-08Remove lo_template_path optionAndras Timar2-2/+2
It was not very useful to let this setting configurable by the user. On the other hand, old path in config file caused issues after upgrade. It is better to decide the location of LOKit core during compilation. From now on the --with-lo-path configure option is compulsory. Change-Id: Icdcbc21bde5dad329fdb6e30ed17efde6b0e73de Reviewed-on: https://gerrit.libreoffice.org/79943 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-09-13Since LibreOfficeOnline.conf has --disable-gui, we don't need these packagesAndras Timar1-1/+1
Change-Id: Ic57af67bf50774c3cafdb26737ee4eeac2f54da0 Reviewed-on: https://gerrit.libreoffice.org/78852 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-09-05tdf#121983 is fixed, remove the hack hereAndras Timar1-3/+0
Change-Id: I93bfc410d21b6283c4566586b4240f1c3556ee0e Reviewed-on: https://gerrit.libreoffice.org/78647 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-09-05docker: install selective set of poco libraries, only what we needAndras Timar1-1/+1
Change-Id: I2776b6817696fbc8d5f24a35165e26bf5ff8c4af Reviewed-on: https://gerrit.libreoffice.org/78646 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-06-25Use pkill to kill process instead of killallSamuel Mehrbrodt2-3/+3
Using killall does not work, it gives 'no process found'. Change-Id: I0e528ab8c0f6f0c4cb06ea5e6c436aecf2274688 Reviewed-on: https://gerrit.libreoffice.org/74679 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-06-13docker: fix SSL cert generation with OpenSSL 1.1.1Andras Timar1-3/+4
Change-Id: I1534cd3d3da19ac17e65571e6e2f7e7b0a8e61ca Reviewed-on: https://gerrit.libreoffice.org/73953 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-06-12Move build options to distro-configSamuel Mehrbrodt1-55/+1
Change-Id: I41963698fafd9d75732c015761d065712e45b40f Reviewed-on: https://gerrit.libreoffice.org/73804 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-06-11Fix docker build (removed configure option)Samuel Mehrbrodt1-1/+0
Change-Id: I6528a3954958803cc651554b8fb6fa7e4d514352 Reviewed-on: https://gerrit.libreoffice.org/73800 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-05-22No more jakeSamuel Mehrbrodt1-9/+0
Change-Id: I21187241142031cd324e63aebf03ce8ca949411d Reviewed-on: https://gerrit.libreoffice.org/72757 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-05-22More specific instructions for setcap nopasswd exceptionSamuel Mehrbrodt1-1/+1
Change-Id: I1f151650331987c598f5a9d98d0f3a11542c12bd Reviewed-on: https://gerrit.libreoffice.org/72756 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-05-22Revert "Adapt paths to new package name"Jan Holesovsky1-11/+11
It is not a good idea to change the configuration directory, it will affect all the existing installations. And the service is called loolwsd - so the configuration should be called that way too. This reverts commit 92785742896f20374fc080922d603cd76d2157ca. Change-Id: I7e6eee644e21ad2dd842742585d16133ff8e36c9 Reviewed-on: https://gerrit.libreoffice.org/72730 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-05-22Adapt paths to new package nameSamuel Mehrbrodt1-11/+11
After 1dbbc5acc7d51adc363c2b43a24afae4b17971a6 Change-Id: I64a12fb13bc8f9371821b2d5969941bfddc2514a Reviewed-on: https://gerrit.libreoffice.org/72728 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-03-07docker: --enable-pdfimport and --disable-poppler in build configAndras Timar1-2/+2
Online does not use poppler anyway, it uses pdfium Change-Id: Ia72b31072640874d2c54d4d4b28f5282e992b6ce
2019-03-05Docker: Run autogen after branch has been checked outSamuel Mehrbrodt1-1/+1
Change-Id: I14126b7344aa4d162738de7173803124b803ab28
2019-02-07systemplate files should not be writable by lool userAndras Timar1-1/+1
Change-Id: Ifb4fb7e5d5c1861b5e26bb6a710acb28e546c846 Reviewed-on: https://gerrit.libreoffice.org/67425 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2019-02-04Docker: Fetch refs before checking out branchSamuel Mehrbrodt1-2/+2
Change-Id: I581fad6dd90831cffceb1bbc7456749fca941a34
2019-01-31Docker: Add env var for extra build optionsSamuel Mehrbrodt1-1/+2
Change-Id: I6f3cb4c526aff5a0543c69143c961b5bc4a555e9
2019-01-31Docker: Add option to skip docker image buildSamuel Mehrbrodt1-4/+8
Need to have this build differently in our env Change-Id: I8233dcf216c527a5238329f94b68836168648cfe
2019-01-30Docker: Restart lool when config changesSamuel Mehrbrodt2-1/+9
Brought here from https://github.com/CollaboraOnline/Docker-CODE/commit/334731d9e5127cf03236026d2ca6dbc1e1fef406 Change-Id: Id64f631454e743f37a378d8b10a78c8d3d4c9f47 Reviewed-on: https://gerrit.libreoffice.org/67041 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-01-28Docker: add env var to change core build targetSamuel Mehrbrodt1-1/+7
Change-Id: Ida0410d6ff6515b479d4d431b4a1060e3430dd9d
2019-01-28docker: Ignore errors when deleting instdirSamuel Mehrbrodt1-1/+1
Building in docker, this is a volume which is undeletable Change-Id: I08c4fd87b1d7ca146f5d91c2cd26675191bd6047
2019-01-21Revert "Docker: Fix runtime dependencies for support key build"Samuel Mehrbrodt1-2/+2
This reverts commit 2880312af5632031155a047cb50561ebb62e9cf4. Turned out it was a problem on the builder machine, not with the image itself.
2019-01-15Docker: Fix runtime dependencies for support key buildSamuel Mehrbrodt1-2/+2
* Install libssl * libPocoNet.so is needed. Only available starting from Ubuntu 18.10, so upgrade the docker base image accordingly Change-Id: I7c60c92d9c1126d36742d3b48992029e55aad405
2018-12-21Docker: Allow chosing which branch to buildSamuel Mehrbrodt1-2/+8
Add an env var for this, default is still "master" Change-Id: If6ded3509efe9bf5bbb5a1d82b0aa2e66ac2c133 Reviewed-on: https://gerrit.libreoffice.org/65544 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2018-12-21Docker: Clone from upstream repoSamuel Mehrbrodt1-2/+2
Change-Id: I0977d3e0de5df0b4cac819559b67548e07a00583 Reviewed-on: https://gerrit.libreoffice.org/65528 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2018-12-21docker: Allow using a different docker hub repo/tagSamuel Mehrbrodt1-2/+15
Still defaults to libreoffice/online:master Change-Id: Ice1f27b273a63aa1e2e3ea87c7ac409004e8b214 Reviewed-on: https://gerrit.libreoffice.org/65525 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2018-12-20kde4 is gone, disable kde5 insteadSamuel Mehrbrodt1-1/+2
Change-Id: I075ae997752199891530eaae509673e255d47de8
2018-12-08docker: do not install system libpixman, fix RPATH of libcairoAndras Timar2-2/+5
Change-Id: I28c6ee71bca80d1dd65daa02af5d719a94d55034
2018-12-07docker: apt-transport-https no longer neededSamuel Mehrbrodt1-2/+1
since we don't have any custom repos anymore Change-Id: Ib6fc8989ed4085b862e3bda5c7136f2022b6d345
2018-12-07Docker: Install libpixmanSamuel Mehrbrodt1-1/+1
This lib was not found after upgrade to Ubuntu 18.04 Change-Id: I37853f115907ae2e795371ec46eee305f91aeed7
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 00:39:55 +0000