Update to support slim Docker image (#180)

.github/workflows/workflow-harden.yml → .github/workflows/workflow-slim.yml

@@ -1,22 +1,17 @@
-name: KatalonDockerCI Harden
+name: Slim Docker Image
 on:
   workflow_dispatch:
     inputs:
       KS_VERSION:
-        description: 'Katalon Studio version (E.g: "9.5.0")'
-        required: false
-        default: 9.5.0
+        description: 'Katalon Studio version (e.g: "9.5.0")'
+        required: true
       KS_VERSION_TAG:
-        description: 'Katalon Studio version tag (E.g: "9.5.0")'
-        required: false
-        default: 9.5.0
+        description: 'Docker image tag (e.g: "9.5.0")'
+        required: true
       KS_VERSION_LATEST_TAG:
-        description: 'Katalon Studio latest version tag (E.g: "9-latest")'
+        description: 'Docker image latest tag (e.g: "9-latest")'
         required: false
-        default: 9-latest
-  push:
-    branches:
-      - master
+
 jobs:
   run:
     name: Run
@@ -41,7 +36,7 @@ jobs:
       run: |
         chmod u+x ./build/*.sh
         ./build/clean.sh $KS_VERSION
-        ./build/build-harden.sh $KS_VERSION
+        ./build/build-slim.sh $KS_VERSION
         ./build/tag.sh $KS_VERSION 
     - name: Test
       run: | 

.github/workflows/workflow.yml

@@ -1,16 +1,25 @@
-name: KatalonDockerCI
+name: Default Docker Image
 on:
-  push:
-    branches:
-      - master
+  workflow_dispatch:
+    inputs:
+      KS_VERSION:
+        description: 'Katalon Studio version (e.g: "9.5.0")'
+        required: true
+      KS_VERSION_TAG:
+        description: 'Docker image tag (e.g: "9.5.0")'
+        required: true
+      KS_VERSION_LATEST_TAG:
+        description: 'Docker image latest tag (e.g: "9-latest")'
+        required: false
+
 jobs:
   run:
     name: Run
     runs-on: ubuntu-latest
     env:
-        KS_VERSION: 9.5.0
-        KS_VERSION_TAG: 9.5.0
-        KS_VERSION_LATEST_TAG: 9-latest
+        KS_VERSION: ${{ inputs.KS_VERSION }}
+        KS_VERSION_TAG: ${{ inputs.KS_VERSION_TAG }}
+        KS_VERSION_LATEST_TAG: ${{ inputs.KS_VERSION_LATEST_TAG }}
     steps:
     - name: Checkout
       uses: actions/checkout@master

build/build-slim.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -xe
+
+ksversion=$1
+
+docker build -t katalon-katalon -f src/Dockerfile.slim --build-arg KATALON_STUDIO_VERSION=$ksversion .

src/Dockerfile.harden → src/Dockerfile.slim

@@ -29,11 +29,11 @@ ARG KATALON_STUDIO_VERSION
 # RUN mkdir -p $KATALON_KATALON_SCRIPT_DIR 
 WORKDIR $KATALON_KATALON_SCRIPT_DIR
 
-COPY ./src/scripts/setup-harden.sh setup-harden.sh
-RUN chmod a+x setup-harden.sh
+COPY ./src/scripts/setup-slim.sh setup-slim.sh
+RUN chmod a+x setup-slim.sh
 
 # Main setup-harden
-RUN $KATALON_KATALON_SCRIPT_DIR/setup-harden.sh
+RUN $KATALON_KATALON_SCRIPT_DIR/setup-slim.sh
 
 # Set locale
 ENV LANG C.UTF-8