Skip to content
Snippets Groups Projects
Commit fdfb64ad authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

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

Resolve "Add registry name in all Docker images"

Closes #10

See merge request to-be-continuous/cypress!30
parents 2759c166 6be1ba8d
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ It uses the following variable: ...@@ -26,7 +26,7 @@ It uses the following variable:
| Name | description | default value | | Name | description | default value |
| --------------------- | ---------------------------------------- | ----------------- | | --------------------- | ---------------------------------------- | ----------------- |
| `CYPRESS_IMAGE` | The Docker image used to run Cypress (use [included images](https://github.com/cypress-io/cypress-docker-images/tree/master/included) only). | `cypress/included:12.0.2` | | `CYPRESS_IMAGE` | The Docker image used to run Cypress (use [included images](https://github.com/cypress-io/cypress-docker-images/tree/master/included) only). | `registry.hub.docker.com/cypress/included:12.0.2` |
| `CYPRESS_PROJECT_DIR` | The Cypress project directory (containing `cypress.config.js` or `cypress.config.ts`) | `.` | | `CYPRESS_PROJECT_DIR` | The Cypress project directory (containing `cypress.config.js` or `cypress.config.ts`) | `.` |
| `CYPRESS_EXTRA_ARGS` | Cypress extra [run options](https://docs.cypress.io/guides/guides/command-line.html#cypress-run) (to select a different browser, configuration or spec files for e.g.) | _none_ | | `CYPRESS_EXTRA_ARGS` | Cypress extra [run options](https://docs.cypress.io/guides/guides/command-line.html#cypress-run) (to select a different browser, configuration or spec files for e.g.) | _none_ |
| `REVIEW_ENABLED` | Set to `true` to enable Cypress tests on review environments (dynamic environments instantiated on development branches) | _none_ (disabled) | | `REVIEW_ENABLED` | Set to `true` to enable Cypress tests on review environments (dynamic environments instantiated on development branches) | _none_ (disabled) |
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
{ {
"name": "CYPRESS_IMAGE", "name": "CYPRESS_IMAGE",
"description": "The Docker image used to run Cypress (use [included images](https://github.com/cypress-io/cypress-docker-images/tree/master/included) only).", "description": "The Docker image used to run Cypress (use [included images](https://github.com/cypress-io/cypress-docker-images/tree/master/included) only).",
"default": "cypress/included:12.0.2" "default": "registry.hub.docker.com/cypress/included:12.0.2"
}, },
{ {
"name": "CYPRESS_PROJECT_DIR", "name": "CYPRESS_PROJECT_DIR",
......
...@@ -49,7 +49,7 @@ variables: ...@@ -49,7 +49,7 @@ variables:
TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"
# Default Docker image (can be overridden) # Default Docker image (can be overridden)
CYPRESS_IMAGE: "cypress/included:12.0.2" CYPRESS_IMAGE: "registry.hub.docker.com/cypress/included:12.0.2"
CYPRESS_PROJECT_DIR: "." CYPRESS_PROJECT_DIR: "."
# default production ref name (pattern) # default production ref name (pattern)
PROD_REF: '/^(master|main)$/' PROD_REF: '/^(master|main)$/'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment