V1.7.9

.github/workflows/publish_agent_docker.yml

@@ -1,23 +1,17 @@
 name: Publish Docker Agent 
 on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: version
-        required: true
-        type: string
-      is-latest:
-        type: boolean
-        description: latest
-        required: false
+  push:
+    branches:
+      - v1.7.9
+
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          ref: release
+          ref: v1.7.9
 
       - name: Login Docker Hub
         uses: docker/login-action@v1
@@ -33,18 +27,18 @@ jobs:
         with:
           context: ./
           file: ./Dockerfile
-          build-args: AGENT_VERSION=${{ inputs.version }}
+          build-args: AGENT_VERSION=1.7.9
           builder: ${{ steps.buildx.outputs.name }}
           push: true
-          tags: katalonstudio/agent:${{ inputs.version }}
+          tags: katalonstudio/agent:1.7.9
 
-      - name: Build and push Docker images
-        uses: docker/build-push-action@v2
-        if: ${{ inputs.is-latest }}
-        with:
-          context: ./
-          file: ./Dockerfile
-          build-args: AGENT_VERSION=${{ inputs.version }}
-          builder: ${{ steps.buildx.outputs.name }}
-          push: true
-          tags: katalonstudio/agent:latest
+      # - name: Build and push Docker images
+      #   uses: docker/build-push-action@v2
+      #   if: ${{ inputs.is-latest }}
+      #   with:
+      #     context: ./
+      #     file: ./Dockerfile
+      #     build-args: AGENT_VERSION=${{ inputs.version }}
+      #     builder: ${{ steps.buildx.outputs.name }}
+      #     push: true
+      #     tags: katalonstudio/agent:latest

Dockerfile

@@ -40,6 +40,7 @@ ENV KATALON_USERNAME=''
 ENV KATALON_API_KEY=''
 ENV TEAM_ID=''
 ENV PROXY=''
+ENV PROXY_EXCLUDE_LIST=''
 ENV LOG_LEVEL='INFO'
 ENV XVFB_RUN=''
 ENV X11_DISPLAY=''

cli.js

@@ -30,6 +30,7 @@ program
   .option('-a, --agent-name <value>', 'Agent name')
   .option('-c, --config <value>', 'Configuration file path')
   .option('-x, --proxy <value>', 'HTTTP/HTTPS Proxy')
+  .option('--proxy-exclude-list <value>', 'Proxy excluded URLs')
   .option('--log-level <value>', 'Log level (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)')
   .option('--xvfb-run <value>', 'xvfb-run options')
   .option('--x11-display <value>', 'x11 DISPLAY environment variable')
@@ -44,6 +45,7 @@ program
       agentName: command.agentName,
       configPath: command.config,
       proxy: command.proxy,
+      proxyExcludeList: command.proxyExcludeList,
       logLevel: command.logLevel,
       xvfbRun: command.xvfbRun,
       x11Display: command.x11Display,
@@ -62,6 +64,7 @@ program
   .option('-a, --agent-name <value>', 'Agent name')
   .option('-c, --config <value>', 'Configuration file path')
   .option('-x, --proxy <value>', 'HTTTP/HTTPS Proxy')
+  .option('--proxy-exclude-list <value>', 'Proxy excluded URLs')
   .option('--ci', 'CI mode')
   .action((command) => {
     const options = {
@@ -72,6 +75,7 @@ program
       agentName: command.agentName,
       configPath: command.config,
       proxy: command.proxy,
+      proxyExcludeList: command.proxyExcludeList,
     };
     if (process.platform === 'win32') {
       readline

docker/entrypoint.sh

@@ -4,9 +4,16 @@ set -xe
 
 echo "Entrypoint"
 
-if [ "$AUTO_UPGRADE_ENVIRONMENT" = true ]; then
+if [[ "$AUTO_UPGRADE_ENVIRONMENT" = true ]]; then
     /katalon/scripts/upgrade_environment.sh || true
 fi
+
+echo "Setup proxy"
+#[ -f /etc/machine-id ] || echo $RANDOM | md5sum | fold -w 32 | head -n 1 > /etc/machine-id
+if [[ -n "${PROXY}" ]]; then
+    git config --global http.proxy ${PROXY}
+fi
+
 if [ -z "$KATALON_USER_ID" ]; then
     exec "$@"
 else

docker/scripts/agent.sh

@@ -16,6 +16,7 @@ cd $KATALON_AGENT_DIR
     --teamid "$TEAM_ID" \
     --agent-name "$AGENT_NAME" \
     --proxy "$PROXY" \
+    --proxy-exclude-list "$PROXY_EXCLUDE_LIST" \
     --log-level "$LOG_LEVEL" \
     --xvfb-run "$XVFB_RUN" \
     --x11-display "$X11_DISPLAY" \