Commit Graph

40 Commits

Author SHA1 Message Date
Corentin ARNOULD a7e622dddc Fix bash indentation and trailing whitespaces
Some shell scripts had tabs indentation. Made it all four spaces.
Hope it's ok with spaces.

Some files had a trailing space in it. It was not useful and takes few bytes for
nothing.

I didn't delete everything.

You can find all tab indented lines with:

grep -rP '^\t' 2>/dev/null

And more trailing space with:
grep -rP ' $' 2>/dev/null
2024-07-06 10:23:49 +02:00
yflory 25bd9243fb Merge branch 'main' into staging 2024-06-24 16:51:04 +02:00
mathilde-cryptpad 88fbf53008 remove 3001 expose port from Dockerfile 2024-05-22 14:28:40 +02:00
Wolfgang Ginolas b058f76b45 Use curl for Docker HEALTHCHECK 2024-04-09 11:56:51 +02:00
Wolfgang Ginolas 5119901fb8 Install dependencies of install-onlyoffice.sh in Dockerfile 2024-04-09 11:56:51 +02:00
Wolfgang Ginolas f5833a9430 Remove OnlyOffice from docker image and install on startup
https://github.com/cryptpad/cryptpad/issues/1416
2024-03-20 13:15:29 +01:00
Guillaume Kulakowski 194c6fc14d
Fix #1349
Fix issue in PR #1287
2023-12-22 15:28:54 +01:00
Mathilde Grünig adef679b4b update Dockerfile to match new configuration example 2023-12-20 18:13:19 +01:00
Mathilde 09db238b96
Merge pull request #1287 from llaumgui/patch-1
Add healthcheck
2023-12-13 15:35:38 +01:00
David Benque 8f0a6319a5 Apply headers 2023-10-20 15:35:26 +01:00
Guillaume Kulakowski d0e80dd11b
Add healthcheck 2023-10-13 17:46:52 +02:00
Mathilde Grünig e21674e580 expose port 3003 to serve websocket 2023-08-14 09:23:38 +02:00
Mathilde Grünig b5983b9fe7 remove Bower support & use NPM 2023-07-11 10:05:14 +02:00
Mathilde Grünig b72c76fe88 remove uneeded and duplicated entries 2023-07-07 11:32:39 +02:00
Mathilde Grünig 0a9f01ad7f update comment for better explanations 2023-07-07 11:21:35 +02:00
Mathilde Grünig 032b094b75 switch from Alpine images to Debian 2023-06-23 14:31:37 +02:00
Mathilde Grünig 9d3265ee04 chown not needed here for Alpine based images 2023-06-22 16:06:16 +02:00
Mathilde Grünig b6b7044d09 forgot to activate entrypoint.sh at the end of Dockerfile 2023-06-22 15:07:05 +02:00
Mathilde Grünig 909cba230c add proper access rights to created folders 2023-06-22 15:06:20 +02:00
Mathilde Grünig cd0ca6fa88 add entrypoint.sh to Dockerfile 2023-06-22 15:05:50 +02:00
Mathilde Grünig 1f47ecbc59 add Dockerfile based on @promasu 's work 2023-05-16 15:02:52 +02:00
Adrian Nöthlich 68e33bb902
Remove docker related files
Signed-off-by: Adrian Nöthlich <git@promasu.tech>
2020-05-05 03:42:44 +02:00
root 2116e46cdd Added missing curl 2020-01-11 13:45:24 +01:00
Adrian Nöthlich 145d0c1d79 Update Node to v12 in Dockerfile
Signed-off-by: Adrian Nöthlich <git@promasu.tech>
2020-01-10 16:00:12 +01:00
ansuz 69bfca52fa nest volumes not exposed via HTTP in 'data' folder for easier migration 2019-12-30 12:11:44 -05:00
Adrian Nöthlich 594d5725cb
Bump NodeJS version to 10 to fix #447
Signed-off-by: Adrian Nöthlich <git@promasu.tech>
2019-09-23 22:07:36 +02:00
ansuz ff22af3343 do some things with docker which I don't really understand 2019-06-20 12:15:02 +02:00
ansuz 4c18289b40
Merge pull request #347 from BundesIT/slim-docker
optimize Dockerfile
2019-06-03 17:23:56 +02:00
yflory 11236c6445 Fix docker issues 2019-03-29 11:33:49 +01:00
ansuz 96e25c13db Merge branch 'soon' into staging 2019-03-28 17:59:55 +01:00
ansuz 744f212b26 keep config.js in config/
and persist it via various docker mechanisms
2019-03-28 17:35:30 +01:00
Thomas Berger ba6167eb5d optimize Dockerfile
- use stretch-slim instead of stretch
- use multistage builds
2019-03-21 16:55:53 +01:00
KemoNine dbb96d9c7c Add 2 missing volumes for blobs 2019-03-19 11:01:05 -04:00
KemoNine 0234578081 Update to node:6-stretch as slim is not available on arm64v8 labels 2019-01-11 17:57:04 +00:00
KemoNine 9261aa193b refactor docker to support arm32/arm64/amd64 all in one build 2019-01-11 06:10:19 +00:00
mcrosson b558004fb8 Expose port 3001 for safe http port ; fix STORAGE variable so it doesn't break the config at runtime 2018-07-16 19:13:57 +00:00
kpcyrd 8dd1c97d6c Fix docker build 2018-01-25 14:04:55 +01:00
Thomas Gläßle 2985c6a051 Cleanup Dockerfile, thanks to @kpcyrd 2017-04-09 11:38:37 +02:00
Thomas Gläßle bb256b8027 Fix startup bug due to old node version
Solution as suggested by @kpcyrd.

Fixed behaviour:

    $ docker logs <CONTAINER>

    /cryptpad/server.js:44
                for (let header in h) { res.setHeader(header, h[header]); }
                     ^^^

    SyntaxError: Block-scoped declarations (let, const, function, class) not yet supported outside strict mode
        at exports.runInThisContext (vm.js:53:16)
        at Module._compile (module.js:374:25)
        at Object.Module._extensions..js (module.js:417:10)
        at Module.load (module.js:344:32)
        at Function.Module._load (module.js:301:12)
        at Function.Module.runMain (module.js:442:10)
        at startup (node.js:136:18)
        at node.js:966:3
2017-04-08 22:07:47 +02:00
felixboehm d8c18d0937 adding docker and docker-compose 2016-12-29 22:02:03 +01:00