docker: cleanup

- remove start-collabora-online.pl from-source Signed-off-by: Rash419 <[email protected]> Change-Id: I4cc477733e8bd6a2c736e16bcb2d75aa295e9895
meven · Oct 9, 2023 · 812212d · 812212d
1 parent 9ae7c29
commit 812212d
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -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"]
diff --git 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
@@ -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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		start-collabora-online.sh
		start-collabora-online.pl