diff --git a/deploy/docker/cloudbeaver-ce/Dockerfile b/deploy/docker/cloudbeaver-ce/Dockerfile index ed385f0164..95bdcc6812 100644 --- a/deploy/docker/cloudbeaver-ce/Dockerfile +++ b/deploy/docker/cloudbeaver-ce/Dockerfile @@ -2,17 +2,12 @@ FROM dbeaver/base-java MAINTAINER DBeaver Corp, devops@dbeaver.com -RUN useradd -m -s /bin/bash dbeaver && \ - apt-get update; \ +RUN apt-get update; \ apt-get upgrade -y; COPY cloudbeaver /opt/cloudbeaver -COPY scripts/launch-product.sh /opt/cloudbeaver/launch-product.sh -RUN chmod +x /opt/cloudbeaver/launch-product.sh -RUN chown -R dbeaver:dbeaver /opt/cloudbeaver EXPOSE 8978 RUN find /opt/cloudbeaver -type d -exec chmod 775 {} \; WORKDIR /opt/cloudbeaver/ - -ENTRYPOINT ["./launch-product.sh"] +ENTRYPOINT ["./run-server.sh"] diff --git a/deploy/scripts/launch-product.sh b/deploy/scripts/launch-product.sh deleted file mode 100644 index 2be1bf59e4..0000000000 --- a/deploy/scripts/launch-product.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# This script is needed to change ownership and run the application as user dbeaver during the upgrade from version 24.2.0 - -# Define the path to the workspace volume and user/group for ownership changes -VOLUME_PATH="/opt/cloudbeaver/workspace" -NEW_USER="dbeaver" -NEW_GROUP="dbeaver" - -# Change ownership of the VOLUME_PATH to the dbeaver user and group -chown -R $NEW_USER:$NEW_GROUP $VOLUME_PATH - -# This allows the dbeaver user and group to have read, write, and execute permissions, while others have only read and execute -find $VOLUME_PATH -type d -exec chmod 775 {} + - -# This allows the dbeaver user and group to read and write files, while others can only read -find $VOLUME_PATH -type f -exec chmod 664 {} + - -# This ensures that the root workspace directory itself has the correct permissions -chmod 775 $VOLUME_PATH - -# Execute run-server.sh as the dbeaver user with the JAVA_HOME and PATH environment variables -exec su $NEW_USER -c "JAVA_HOME=$JAVA_HOME PATH=$PATH ./run-server.sh" \ No newline at end of file