Commit 8fff3f9d authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

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

Resolve "Add registry name in all Docker images"

Closes #16

See merge request to-be-continuous/mkdocs!33
parents b02b0604 9ba6a899

README.md

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


| Name                    | description                            | default value     |

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

| `MKD_IMAGE`             | The Docker image used to run MkDocs       | `polinux/mkdocs:latest` |

| `MKD_IMAGE`             | The Docker image used to run MkDocs       | `registry.hub.docker.com/polinux/mkdocs:latest` |

| `MKD_WORKSPACE_DIR`     | MkDocs sources directory | `.` |

| `MKD_REQUIREMENTS_FILE` | Requirements file. If the file is not found in the repository, requirements are read from the `MKD_REQUIREMENTS` variable | `requirements.txt` |

| `MKD_REQUIREMENTS`      | Space separated requirements (ignored if a requirement file is found) | `mkdocs` |

kicker.json

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

      "name": "MKD_IMAGE",

      "description": "The Docker image used to run MkDocs",

      "default": "polinux/mkdocs:latest"

      "default": "registry.hub.docker.com/polinux/mkdocs:latest"

    },

    {

      "name": "MKD_BUILD_ARGS",

templates/gitlab-ci-mkdocs.yml

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



  MKD_WORKSPACE_DIR: .

  MKD_IMAGE: polinux/mkdocs:latest

  MKD_IMAGE: "registry.hub.docker.com/polinux/mkdocs:latest"

  MKD_REQUIREMENTS: "mkdocs"

  MKD_REQUIREMENTS_FILE: "requirements.txt"

  MKD_SITE_DIR: "site"