Merge pull request #11 from Nilsty/master

make the docker image configurable
joonvena · Nov 28, 2022 · 3e8b84b · 3e8b84b
2 parents 3434822 + e44ed7d
commit 3e8b84b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -35,15 +35,16 @@ Run with firefox and in parallel:
 
 Available configurations in with block:
 
-| Name                     | Default       | Description                                            |
-| ------------------------ | ------------- | ------------------------------------------------------ |
-| allowed_shared_memory    | '1g'          | How much container can use shared memory               |
-| browser                  | 'chrome'      | Available options chrome / firefox                     |
-| robot_threads            | 1             | Change this > 1 if you want to run tests in parallel   |
-| pabot_options            | ''            | These are only used if robot_threads > 1               |
-| robot_options            | ''            | Pass extra settings for robot command                  |
-| screen_color_depth       | 24            | Color depth of the virtual screen                      |
-| screen_height            | 1080          | Height of the virtual screen                           |
-| screen_width             | 1920          | Width of the virtual screen                            |
-| robot_tests_dir          | 'robot_tests' | Location of tests inside repository                    |
-| robot_reports_dir        | 'reports'     | Location of report output from test execution          |
+| Name                     | Default                             | Description                                          |
+| ------------------------ | ----------------------------------- | ---------------------------------------------------- |
+| allowed_shared_memory    | '1g'                                | How much container can use shared memory             |
+| browser                  | 'chrome'                            | Available options chrome / firefox                   |
+| robot_threads            | 1                                   | Change this > 1 if you want to run tests in parallel |
+| pabot_options            | ''                                  | These are only used if robot_threads > 1             |
+| robot_options            | ''                                  | Pass extra settings for robot command                |
+| screen_color_depth       | 24                                  | Color depth of the virtual screen                    |
+| screen_height            | 1080                                | Height of the virtual screen                         |
+| screen_width             | 1920                                | Width of the virtual screen                          |
+| robot_tests_dir          | 'robot_tests'                       | Location of tests inside repository                  |
+| robot_reports_dir        | 'reports'                           | Location of report output from test execution        |
+| robot_runner_image       | 'ppodgorsek/robot-framework:latest' | Docker image which will be used to execute the tests |
diff --git a/action.yml b/action.yml
@@ -41,6 +41,11 @@ inputs:
     description: 'Where will the report from test be saved'
     required: true
     default: 'reports'
+  robot_runner_image:
+    description: 'The docker image which will be used to execute the tests'
+    required: true
+    default: 'ppodgorsek/robot-framework:latest'
+
 
 runs:
   using: 'composite'
@@ -58,3 +63,4 @@ runs:
         SCREEN_WIDTH: ${{ inputs.screen_width }}
         ROBOT_TESTS_DIR: ${{ inputs.robot_tests_dir }}
         ROBOT_REPORTS_DIR: ${{ inputs.robot_reports_dir }}
+        ROBOT_RUNNER_IMAGE: ${{ inputs.robot_runner_image }}
diff --git a/test.sh b/test.sh
@@ -11,4 +11,4 @@ docker run --shm-size=$ALLOWED_SHARED_MEMORY \
   -v $REPORTS_DIR:/opt/robotframework/reports:Z \
   -v $TESTS_DIR:/opt/robotframework/tests:Z \
   --user $(id -u):$(id -g) \
-  ppodgorsek/robot-framework:latest
+  $ROBOT_RUNNER_IMAGE