Commit 110fde15 authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

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

Resolve "Add registry name in all Docker images"

Closes #42

See merge request to-be-continuous/python!69
parents 9a05c651 5650f7e2

README.md

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ The Python template uses some global configuration used throughout all jobs. 


| Name                 | description                                                                           | default value      |

| -------------------- | ------------------------------------------------------------------------------------- | ------------------ |

| `PYTHON_IMAGE`       | The Docker image used to run Python <br/>:warning: **set the version required by your project** | `python:3` |

| `PYTHON_IMAGE`       | The Docker image used to run Python <br/>:warning: **set the version required by your project** | `registry.hub.docker.com/library/python:3` |

| `PYTHON_PROJECT_DIR` | Python project root directory                                                         | `.`                |

| `PYTHON_BUILD_SYSTEM`| Python build-system to use to install dependencies, build and package the project (see below) | _none_ (auto-detect) |

| `PIP_INDEX_URL`      | Python repository url                                                                 | _none_             |

kicker.json

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    {

      "name": "PYTHON_IMAGE",

      "description": "The Docker image used to run Python - **set the version required by your project**",

      "default": "python:3"

      "default": "registry.hub.docker.com/library/python:3"

    },

    {

      "name": "PYTHON_PROJECT_DIR",

templates/gitlab-ci-python.yml

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ variables: 
  POETRY_VIRTUALENVS_IN_PROJECT: "false"

  PIPENV_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pipenv"



  PYTHON_IMAGE: python:3

  PYTHON_IMAGE: "registry.hub.docker.com/library/python:3"

  # Default Python project root directory

  PYTHON_PROJECT_DIR: .
@@ -73,7 +73,7 @@ variables: 
  SAFETY_ARGS: "--full-report"



  # Trivy tool

  PYTHON_TRIVY_IMAGE: aquasec/trivy:latest

  PYTHON_TRIVY_IMAGE: "registry.hub.docker.com/aquasec/trivy:latest"

  PYTHON_TRIVY_ARGS: "--vuln-type library"



  PYTHON_SBOM_OPTS: "--catalogers python-index-cataloger"