Use stable image with root user and embedded browsers (#205)

katalon-studio · Feb 6, 2025 · f84bc8b · f84bc8b
1 parent 38ea715
commit f84bc8b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 55 deletions.
diff --git a/src/Dockerfile b/src/Dockerfile
@@ -1,4 +1,4 @@
-FROM katalonstudio/ubuntu-20.04:b1f45a6
+FROM katalonstudio/ubuntu-20.04:bfee29a
 
 # common environment variables
 ARG TARGETPLATFORM

diff --git a/src/Dockerfile.slim b/src/Dockerfile.slim
@@ -1,4 +1,4 @@
-FROM katalonstudio/ubuntu-20.04-harden:adc38c1
+FROM katalonstudio/ubuntu-20.04-harden:70a4928
 
 # common environment variables
 ARG TARGETPLATFORM

diff --git a/src/scripts/setup-slim.sh b/src/scripts/setup-slim.sh
@@ -4,32 +4,6 @@ set -xe
 
 TARGETPLATFORM=$1
 
-echo "Install Mozilla Firefox"
-apt -y install firefox
-# Install 'pulseaudio' package to support WebRTC audio streams
-apt -y install pulseaudio
-echo "$(firefox -version)" >> $KATALON_VERSION_FILE
-
-if [ "$TARGETPLATFORM" == "linux/amd64" ]; then
-    echo "Install Google Chrome"
-    chrome_package='google-chrome-stable_current_amd64.deb'
-    wget -O $chrome_package https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-    dpkg -i $chrome_package || apt -y -f install
-    rm $chrome_package
-    echo "$(google-chrome --version)" >> $KATALON_VERSION_FILE || true
-
-    ./wrap_chrome_binary.sh && rm -rfv ./wrap_chrome_binary.sh
-
-    echo "Install Edge Chromium"
-    microsoft_edge_package='MicrosoftEdgeSetup.exe'
-    wget -O $microsoft_edge_package https://go.microsoft.com/fwlink?linkid=2149051
-    dpkg -i $microsoft_edge_package || apt -y -f install
-    rm $microsoft_edge_package
-    echo "$(microsoft-edge --version)" >> $KATALON_VERSION_FILE || true
-
-    ./wrap_edge_chromium_binary.sh && rm -rfv ./wrap_edge_chromium_binary.sh
-fi
-
 # copy scripts
 mkdir -p $KATALON_KATALON_ROOT_DIR
 cd $KATALON_KATALON_ROOT_DIR
@@ -79,7 +53,7 @@ tar -xvzf $katalon_package -C $KATALON_KATALON_INSTALL_DIR_PARENT
 ls
 
 # Remove webdrivermanager.jar
-rm $KATALON_KATALON_INSTALL_DIR_PARENT/$katalon_unzipped_directory/configuration/resources/tools/webdriver/webdrivermanager-5.9.2-fat.jar
+rm $KATALON_KATALON_INSTALL_DIR_PARENT/$katalon_unzipped_directory/configuration/resources/tools/webdriver/webdrivermanager-5.9.2.1-fat.jar
 
 rm $katalon_package
 mv $KATALON_KATALON_INSTALL_DIR_PARENT/$katalon_unzipped_directory $KATALON_KATALON_INSTALL_DIR

diff --git a/src/scripts/setup.sh b/src/scripts/setup.sh
@@ -4,32 +4,6 @@ set -xe
 
 TARGETPLATFORM=$1
 
-echo "Install Mozilla Firefox"
-apt -y install firefox
-# Install 'pulseaudio' package to support WebRTC audio streams
-apt -y install pulseaudio
-echo "$(firefox -version)" >> $KATALON_VERSION_FILE
-
-if [ "$TARGETPLATFORM" == "linux/amd64" ]; then
-    echo "Install Google Chrome"
-    chrome_package='google-chrome-stable_current_amd64.deb'
-    wget -O $chrome_package https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-    dpkg -i $chrome_package || apt -y -f install
-    rm $chrome_package
-    echo "$(google-chrome --version)" >> $KATALON_VERSION_FILE || true
-
-    ./wrap_chrome_binary.sh && rm -rfv ./wrap_chrome_binary.sh
-
-    echo "Install Edge Chromium"
-    microsoft_edge_package='MicrosoftEdgeSetup.exe'
-    wget -O $microsoft_edge_package https://go.microsoft.com/fwlink?linkid=2149051
-    dpkg -i $microsoft_edge_package || apt -y -f install
-    rm $microsoft_edge_package
-    echo "$(microsoft-edge --version)" >> $KATALON_VERSION_FILE || true
-
-    ./wrap_edge_chromium_binary.sh && rm -rfv ./wrap_edge_chromium_binary.sh
-fi
-
 # symlink Google Chrome
 symlink="/usr/bin/google-chrome"
 if [ -L $symlink ]; then