Rash419
812212d598
docker: cleanup
...
- remove start-collabora-online.pl from-source
Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: I4cc477733e8bd6a2c736e16bcb2d75aa295e9895
2023-10-09 19:06:51 +05:30
Andras Timar
2e86ea467e
docker: use env vars to configure the container
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ib6267c05e687a64d5a2e4df2a1d42c33e001f999
2023-09-28 10:54:14 +02:00
Andras Timar
cc628feda7
docker: do not generate WOPI proof key, it's better to mount it externally
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I4141546c4ab281dfe749b16b119eb9de46fd9e67
2023-09-28 10:54:14 +02:00
Andras Timar
6789c663d2
docker: use internal inotify implementation instead of inotifywait command
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I74e16827bd7033fe3a2282da562b35cc9bfc3eb4
2023-09-28 10:54:14 +02:00
Andras Timar
28737d8272
docker: we do not have to set SAL_LOG here, because it's set in coolwsd.xml
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I80bdc3a2b8fa6f571624395ed8c1917eb241b0cd
2023-09-28 10:54:14 +02:00
Rash419
3831e6f4e2
docker: fix permission denied in archlinux
...
Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: I6eac76976c6bd076f24c795b3eeec876bfef3e6b
2023-08-04 07:58:56 +02:00
Andras Timar
fc946198d3
Rewrite coolwsd-generate-proof-key in C++
...
* simplified the tooling a bit: use coolconfig for creating
RSA key pairs for WOPI Proof headers.
* got rid of a dependency: ssh-keygen, towards leaner docker images
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Iaf468b5c8585d45027f512bb0a287ab77afb1ea9
2023-07-22 00:14:48 +02:00
Andras Timar
1f0013e811
docker: remove obsolete fix
...
The domain resolution problem from jails was properly solved by
bc8da0cb33
This hack is not necessary in docker.
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I59664b895d187b2a8930a34b096305e0b7c384e3
2023-07-07 19:11:01 +02:00
Andras Timar
43965a0c6c
docker: force mv
...
I saw unexpectedly a prompt in non-interactive mode:
mv: replace '/etc/coolwsd/key.pem', overriding mode 0600 (rw-------)?
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I9acdc52bd612a1de52b5989e854b45898eda4b01
2023-06-13 11:36:01 +02:00
Andras Timar
ab6dc9e044
docker: numeric user id of cool user is 100
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I7a3679289245f837d21525eb64eb234b7c796755
2023-06-13 08:54:43 +02:00
Andras Timar
e28e3643c5
docker: one more chmod commit was missing
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I18495a706326d0b6af98895501f5b830af7e08c3
2023-06-13 08:19:55 +02:00
Andras Timar
4402df41be
docker: fix unexpected operator in shell script
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I4933491ef695511dd580be273edd6eff606894d4
2023-06-09 11:22:57 +02:00
Andras Timar
caf4b7c417
docker: cleanups
...
- removed old/obsolete dockerfiles
- updated README
- added back the starter scripts to Dockerfile, in order not to break
existing API, i.e. environment variables for aliasgroups, admin, etc.
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I8ed88afd9db3bc53f9b5529f20764b538b302596
2023-06-09 11:22:57 +02:00
Andras Timar
466638f369
docker: add back inotifywait
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I476bac56190d95f96380e3cc40a8b88d726bf8b1
2023-06-09 11:22:57 +02:00
Andras Timar
1822bc13f1
docker: 23.05 image based on DebianSlim
...
This new DebianSlim dockerfile eliminates the use of installer script
which was an anti-pattern.
The inotifywait hook for watching changing coolwsd.xml was removed. Was it
useful? I don't know. Please complain, if you miss it.
DebianSlim is still not "distroless". Probably first we should solve the
name resoltion problem in jails, in order to eliminate the need of copying
/etc/hosts and /etc/resolv.conf to systemplate at startup.
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I26948eb21a1bc3092b93d02d93e03269e9a70198
2023-06-09 11:22:57 +02:00
Ralf Becker
5282d1ccfe
Fix not working inotify / restart on coolwsd.xml changes
...
Signed-off-by: ralf <rb@egroupware.org>
Change-Id: Ibab659911e4133437bcee404172e5d8eb0a3f305
2023-04-28 15:27:48 +02:00
Andras Timar
9dd0b6b059
docker: updated readme
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I8a14cb16bea4f4f530b135fc9343ba5b4ec6e9f0
2023-03-19 12:55:23 +01:00
inductor
5ca5ed3b01
Use COPY rather than ADD
...
Signed-off-by: inductor <kela@inductor.me>
Change-Id: I6f34fe0f41af627a8d6966ca42ead3b324251eba
2023-02-03 12:36:02 +01:00
Andras Timar
ef1cf7cf49
#5609 add '# syntax=docker/dockerfile:1.2' to dockerfiles that use --mount option
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I57600aa071c9f190ded05867bffc3bad7d54da1d
2022-12-23 10:07:21 +01:00
Andras Timar
0bc8245c56
docker: allow to build image from packages without brand package
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ie8aaec40236450a371e017692e2474811c3e6849
2022-12-13 23:23:20 +01:00
Rash419
737fff0830
docker: added docker file for arch linux to build from source
...
Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: I96a3f07e32fe0132be2081db11b62c666097057d
2022-11-03 13:47:57 +01:00
Tushar
b4ee1a49f0
resolved the Debian 11 dockerfile dependecies issues
...
This fixes the issue #4695
Signed-off-by: Tushar <tusharbarman123@gmail.com>
Change-Id: Id8a6769ffab18b1d5094799e63d851685c5b1a4f
resolved the intendation issues and duplication issue
Signed-off-by: Tushar <tusharbarman123@gmail.com>
Change-Id: I650e1417f14d156e4a39ba8e6261460d048dfa85
removed lines
Signed-off-by: Tushar <tusharbarman123@gmail.com>
Change-Id: I4ce387a20bee21c9269db6486c8261db96b76ac8
Removed further lines
Signed-off-by: Tushar <tusharbarman123@gmail.com>
Change-Id: If6d7904719cc0fb4800a9f3da1d6043903ee9fec
2022-10-25 14:16:34 +02:00
Andras Timar
42c05fda66
docker: add 'DOCKER_BUILDKIT=1' to documentation, fixes #5296
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I20384c93754b60800ba21a46b58106fa97deb75e
2022-09-25 13:50:08 +02:00
Andras Timar
08741ed9e4
docker: fix install script for ppc64
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ic4217880ec52061601d3e0e3403da707fd10a844
2022-09-18 21:22:41 +02:00
Andras Timar
ba847a7f58
docker: support ppc64le
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ie3ba247471aec999a1af09e5a7140cf70b45ac03
2022-09-18 21:03:43 +02:00
Andras Timar
b4e6fe82c7
docker: better handling of customer repo URL
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I4f750a8679e193ede399ae51d9b8b8cff5502f4d
2022-09-18 19:34:26 +02:00
Aron Budea
db713b9c9d
docker: update files for the 22.05 release
...
Signed-off-by: Aron Budea <aron.budea@collabora.com>
Change-Id: I437b0a4c4eb552579548bc0ede66a8209453d360
2022-08-11 16:31:24 +02:00
Andras Timar
c2ec7a3468
docker: add CODE branding (optionally) to image built from source
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ibf21760668b77c8734316bf5219509ed899aba62
2022-07-19 21:54:51 +02:00
Andras Timar
70b99be0e8
docker: strip core binaries, otherwise the docker image would be huge
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Id1b8eab2b722b22a63593a2b8b85b21ebe670271
2022-07-19 14:21:14 +02:00
Tobia Conforto
aba9091209
Added support for setting the timezone in Docker
...
Added the 'tzdata' package to Ubuntu-based Docker builds and the
'timezone' package to openSUSE builds, to allow Docker users to run
the containers with a custom timezone by passing a TZ env variable.
Signed-off-by: Tobia Conforto <tobia.conforto@gmail.com>
Change-Id: Idafd84dde3383b4801ff4b3ebb8ac1826fe49fcc
2022-07-14 11:24:03 +02:00
Rash419
120818c9a7
docker: improve start-collabora-online.pl
...
based on extra_params update the scheme and port when mapping domain->alias_groups
Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: Ic5783112b8331407622f547a84d70ab2e1ba0c37
2022-07-09 10:04:40 +02:00
Rash419
81359f5edc
docker: update start-collabora-online.pl to allow regex
...
because we now support having regex in alias_groups.group.host
for more info: 45891d0ded
Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: Ib8c16cd7db18719076d62347738e23bbefaa9204
2022-07-08 14:13:36 +02:00
Rash419
1ceb9784b0
docker: added new remoteconfigurl env variable
...
Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: I735ae70e6ea335ae1a96662248e8815731654812
2022-05-10 22:31:40 +05:30
Rash419
c5d06ebbdf
docker: map domain env variable to alias_groups
...
show a verbose warning about using domain
Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: I41fdea3419eb2719fa665a62de33e3a237cf3df8
2022-05-10 22:31:40 +05:30
Marco Marinello
d61163857b
[docker] Remove -j from core build
...
Signed-off-by: Marco Marinello <contact+nohuman@marinello.bz.it>
Change-Id: I851bb20c5c9cf983d558c248435b1d47731dcb51
2022-04-12 09:57:10 +02:00
Marco Marinello
c544acfd22
[docker] Be consistent in number of processors used to build
...
Signed-off-by: Marco Marinello <contact+nohuman@marinello.bz.it>
Change-Id: I063b82ad9ee7b8795637ea058e1e15b8331c8818
2022-04-12 09:57:10 +02:00
Rash419
ff8236740f
docker: added start-collabora-online.pl in docker files
...
Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: I224c9dc017257403c7c92ba4be8c3d76e77f5270
2022-04-05 13:47:57 +02:00
Jan Holesovsky
031fb0e398
Script to rewrite coolwsd.xml based on the aliasgroup<number> envvars
...
This is to be able to define the alias groups via YAML easily, like:
environment:
- aliasgroup1=https://servername:443,https://its-alias:443,https://its-second-alias:443
- aliasgroup2=https://second-servername:443,https://seconds-alias:443
Signed-off-by: Jan Holesovsky <kendy@collabora.com>
Change-Id: Ib653f7ab420fed342a00f5f5997a113da9739866
2022-04-05 13:47:57 +02:00
Andras Timar
0a978edd87
docker: from-source: cool user has id 498 in latest opensuse/leap
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ie730b609e3bcccfa3ff6ddb2f949353846f7eec9
2022-02-22 10:57:21 +01:00
Andras Timar
01903149b0
docker: from-source: use the new distro/collabora/co-22.05 core branch
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I72c2d51e6d3984e822b0e050f4d78513d792065f
2022-02-22 10:57:21 +01:00
Andras Timar
96e3c161c3
docker: from-source: use latest POCO 1.11.1 release
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I492b6231e4e290523638e60549447fb9877a2bba
2022-02-22 10:57:21 +01:00
Andras Timar
e668110461
docker: update files for upcoming 21.11 release
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Id4b572e4970844a7da7ff64603483d67f13285c2
2021-11-22 15:00:16 +01:00
Andras Timar
4873480d63
Revert "docker: Make Notebookbar the default again"
...
This reverts commit b92befff94
.
Reason: we have new default on 21.11, cf. b4f588ea3
and this patch
is now obsolete. We cannot build 6.4 docker images from this branch
anyway, because of the rename.
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I1dd0960b3bdbeecec52d548a4053a3482887df0c
2021-11-22 14:36:08 +01:00
Andras Timar
e6dcb98d1d
docker: online master branch is buildable with code distro/collabora/co-2021 branch
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I274b4fe636bdb19c45c32b4ec7af1c4e7b711522
2021-11-22 14:24:44 +01:00
Andras Timar
2a2f567d8d
docker: prepatarion of CODE 21.11
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I434ed669549fcf0c0a6417b63ff2ebed3cac18e3
2021-11-18 16:06:01 +01:00
Andras Timar
f07ff8c7e0
rename: remaining lool->cool changes
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ib7d4e804bebe52dead8d53b0e0bbaed0f08bf3d0
2021-11-18 14:14:11 +01:00
Marco Marinello
4c1185be73
Fix debian dockerfile
...
explicitly set buster as source since is now oldstable
Signed-off-by: Marco Marinello <me@marcomarinello.it>
Change-Id: I7153ad1ce61bc6fcd4862209a01a4f73e68b5aa5
2021-11-18 07:43:24 +01:00
Andras Timar
504c05df3b
rename: loolwsd-systemplate-setup -> coolwsd-systemplate-setup
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I699db87f94f9080909c2ca783e04ad8b4dd98025
2021-11-17 22:10:58 +01:00
Andras Timar
bf5bce7669
rename: loolwsd-generate-proof-key -> coolwsd-generate-proof-key
...
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I3aa30ce4e5f6df2068fa2e0788034e83cb0ae26b
2021-11-17 22:06:34 +01:00
Mert Tumer
c9a4d2f6f3
rename: loolmount -> coolmount
...
Signed-off-by: Mert Tumer <mert.tumer@collabora.com>
Change-Id: Ic025c5a76c6f27cdf1a6267f24cf8052733f1f24
2021-11-17 21:51:05 +01:00