Commit 41ac1c4a authored Jan 27, 2023 by Cédric OLIVIER

Merge branch '15-add-registry-name-in-all-docker-images' into 'master'

Resolve "Add registry name in all Docker images"

Closes #15

See merge request to-be-continuous/robotframework!30

parents fc0f2738 5b032f8c

README.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ It is bound to the `acceptance` stage, and uses the following variable:

		\| Name \| description \| default value \|
		\| --------------------- \| ----------------------------------------------------------- \| ------------- \|
		\| `ROBOT_BASE_IMAGE` \| The Docker image used to run Robot Framework \| `ppodgorsek/robot-framework:latest` \|
		\| `ROBOT_BASE_IMAGE` \| The Docker image used to run Robot Framework \| `registry.hub.docker.com/ppodgorsek/robot-framework:latest` \|
		\| `ROBOT_TESTS_DIR` \| Robot Framework's tests directory \| `robot` \|
		\| `ROBOT_THREADS` \| Number of threads to execute Robot Framework's tests (uses [Pabot](https://pabot.org/) if > `1`) \| `1` \|
		\| `ROBOT_SCREEN_COLOUR_DEPTH` \| Screen colour depth for X Window Virtual Framebuffer \| `24` \|

kicker.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		{
		"name": "ROBOT_BASE_IMAGE",
		"description": "The Docker image used to run Robot frame work CLI",
		"default": "ppodgorsek/robot-framework:latest"
		"default": "registry.hub.docker.com/ppodgorsek/robot-framework:latest"
		},
		{
		"name": "ROBOT_TESTS_DIR",

templates/gitlab-ci-robotframework.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ variables:
		TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"

		# Default Docker image (can be overridden)
		ROBOT_BASE_IMAGE: "ppodgorsek/robot-framework:latest"
		ROBOT_BASE_IMAGE: "registry.hub.docker.com/ppodgorsek/robot-framework:latest"
		ROBOT_PROJECT_IMAGE: $ROBOT_BASE_IMAGE
		ROBOT_TESTS_DIR: robot