diff options
| author | Rash419 <rashesh.padia@collabora.com> | 2023-10-09 15:46:21 +0530 |
|---|---|---|
| committer | Rashesh Padia <rasheshpadia419@gmail.com> | 2023-10-09 19:06:51 +0530 |
| commit | 812212d59860931de3151d120b54364a811e2508 (patch) | |
| tree | 7fb9e0ef06d0d5ad6c09a32179f1fd214a4790d4 /docker | |
| parent | cid#318975 help coverity see assert (diff) | |
| download | online-812212d59860931de3151d120b54364a811e2508.tar.gz online-812212d59860931de3151d120b54364a811e2508.zip | |
docker: cleanup
- remove start-collabora-online.pl from-source
Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: I4cc477733e8bd6a2c736e16bcb2d75aa295e9895
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/from-source/.gitignore | 1 | ||||
| -rw-r--r-- | docker/from-source/ArchLinux | 5 | ||||
| -rw-r--r-- | docker/from-source/Debian | 1 | ||||
| -rw-r--r-- | docker/from-source/Ubuntu | 1 | ||||
| -rwxr-xr-x | docker/from-source/build.sh | 1 | ||||
| -rw-r--r-- | docker/from-source/openSUSE | 1 |
6 files changed, 2 insertions, 8 deletions
diff --git a/docker/from-source/.gitignore b/docker/from-source/.gitignore index edddb4d416..40b3c9fa1e 100644 --- a/docker/from-source/.gitignore +++ b/docker/from-source/.gitignore @@ -1,2 +1 @@ start-collabora-online.sh -start-collabora-online.pl diff --git a/docker/from-source/ArchLinux b/docker/from-source/ArchLinux index 82881c065c..5fd7f81bd0 100644 --- a/docker/from-source/ArchLinux +++ b/docker/from-source/ArchLinux @@ -17,7 +17,6 @@ COPY /instdir / # copy the shell script which can start Collabora Online (coolwsd) COPY /start-collabora-online.sh / -COPY /start-collabora-online.pl / # set up Collabora Online (normally done by postinstall script of package) # Fix permissions @@ -34,9 +33,9 @@ RUN setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit EXPOSE 9980 -RUN usermod -u 973 cool +RUN usermod -u 972 cool # switch to cool user (use numeric user id to be compatible with Kubernetes Pod Security Policies) -USER 973 +USER 972 CMD ["/start-collabora-online.sh"]
\ No newline at end of file diff --git a/docker/from-source/Debian b/docker/from-source/Debian index 06d1da0011..d119670739 100644 --- a/docker/from-source/Debian +++ b/docker/from-source/Debian @@ -21,7 +21,6 @@ COPY /instdir / # copy the shell script which can start Collabora Online (coolwsd) COPY /start-collabora-online.sh / -COPY /start-collabora-online.pl / # set up Collabora Online (normally done by postinstall script of package) # Fix permissions diff --git a/docker/from-source/Ubuntu b/docker/from-source/Ubuntu index 80ca6e157f..698ac2fc37 100644 --- a/docker/from-source/Ubuntu +++ b/docker/from-source/Ubuntu @@ -23,7 +23,6 @@ COPY /instdir / # copy the shell script which can start Collabora Online (coolwsd) COPY /start-collabora-online.sh / -COPY /start-collabora-online.pl / # set up Collabora Online (normally done by postinstall script of package) # Fix permissions diff --git a/docker/from-source/build.sh b/docker/from-source/build.sh index 2ff4fcddf0..1d0e76f2c5 100755 --- a/docker/from-source/build.sh +++ b/docker/from-source/build.sh @@ -149,7 +149,6 @@ fi if [ -z "$NO_DOCKER_IMAGE" ]; then cd "$SRCDIR" cp ../from-packages/scripts/start-collabora-online.sh . - cp ../from-packages/scripts/start-collabora-online.pl . docker build --no-cache -t $DOCKER_HUB_REPO:$DOCKER_HUB_TAG -f $HOST_OS . || exit 1 else echo "Skipping docker image build" diff --git a/docker/from-source/openSUSE b/docker/from-source/openSUSE index e8275e6cba..147b739727 100644 --- a/docker/from-source/openSUSE +++ b/docker/from-source/openSUSE @@ -17,7 +17,6 @@ COPY /instdir / # copy the shell script which can start Collabora Online (coolwsd) COPY /start-collabora-online.sh / -COPY /start-collabora-online.pl / # set up Collabora Online (normally done by postinstall script of package) # Fix permissions |