diff options
| author | Erik Habicht <erik.habicht@gmail.com> | 2021-10-17 10:43:36 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-11-16 11:28:14 +0100 |
| commit | cbe99ee87412ccc6c3e1ad9d57d20536154f91d6 (patch) | |
| tree | 2026ea701909f6889f7d421bb11483c61e5736e9 /docker | |
| parent | rename coolstress to jsstress (diff) | |
| download | online-cbe99ee87412ccc6c3e1ad9d57d20536154f91d6.tar.gz online-cbe99ee87412ccc6c3e1ad9d57d20536154f91d6.zip | |
Move adding the start script after running the install script.
This will speed up docker build if only something in start-collabora-online.sh has changed.
Signed-off-by: Erik Habicht <erik.habicht@gmail.com>
Change-Id: Iaa9566f6793b47877901522f1f0e7cb2acc530b6
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/from-packages/RHEL8 | 4 | ||||
| -rw-r--r-- | docker/from-packages/Ubuntu | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docker/from-packages/RHEL8 b/docker/from-packages/RHEL8 index d959d54e0a..f7882cc3e7 100644 --- a/docker/from-packages/RHEL8 +++ b/docker/from-packages/RHEL8 @@ -29,10 +29,12 @@ ENV LC_CTYPE C.UTF-8 # Setup scripts for Collabora Online ADD /scripts/install-collabora-online-rhel8.sh / -ADD /scripts/start-collabora-online.sh / RUN bash install-collabora-online-rhel8.sh RUN rm -rf /install-collabora-online-rhel8.sh +# Start script for Collabora Online +ADD /scripts/start-collabora-online.sh / + EXPOSE 9980 # switch to lool user (use numeric user id to be compatible with Kubernetes Pod Security Policies) diff --git a/docker/from-packages/Ubuntu b/docker/from-packages/Ubuntu index fa60aa3c31..54d034e257 100644 --- a/docker/from-packages/Ubuntu +++ b/docker/from-packages/Ubuntu @@ -29,10 +29,12 @@ ENV LC_CTYPE C.UTF-8 # Setup scripts for Collabora Online ADD /scripts/install-collabora-online-ubuntu.sh / -ADD /scripts/start-collabora-online.sh / RUN bash install-collabora-online-ubuntu.sh RUN rm -rf /install-collabora-online-ubuntu.sh +# Start script for Collabora Online +ADD /scripts/start-collabora-online.sh / + EXPOSE 9980 # switch to lool user (use numeric user id to be compatible with Kubernetes Pod Security Policies) |