Commit 916575d6 authored by Thomas Boni's avatar Thomas Boni
Browse files

Merge branch '617-fix-some-typo-and-job-template' into 'latest' 

Resolve "Fix - some typo and job template"

Closes #617

See merge request r2devops/hub!378
parents 468588a1 6c2ddf4a

jobs/ansible_playbook/README.md

+2 −2
Original line number Diff line number Diff line
@@ -23,6 +23,6 @@ This job will run an [`ansible-playbook`](https://docs.ansible.com/ansible/lates 
| Name                                      | Description                                                                                                                                       | Default              |

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

| `ANSIBLE_WORKSPACE` <img width=100/>      | The path where is located your ansible project <img width=175/>                                                                                   | `.` <img width=100/> |

| `ANSIBLE_INVENTORY_FILE` <img width=100/> | The inventory file where are described roles and groups. This variable should be specified in `Gitalb > CI/CD Settings` as file. <img width=175/> | ` ` <img width=100/>  |

| `SSH_PRIVATE_KEY_FILE` <img width=100/>   | ⚠️ Mandatory variable. The name of your private SSH key. his variable should be specified in `Gitalb > CI/CD Settings` as file. <img width=175/>   | ` ` <img width=100/>  |

| `ANSIBLE_INVENTORY_FILE` <img width=100/> | The inventory file where are described roles and groups. This variable should be specified in `GitLab > CI/CD Settings` as file. <img width=175/> | ` ` <img width=100/>  |

| `SSH_PRIVATE_KEY_FILE` <img width=100/>   | ⚠️ Mandatory variable. The name of your private SSH key. This variable should be specified in `GitLab > CI/CD Settings` as file. <img width=175/>   | ` ` <img width=100/>  |

| `ADDITIONAL_OPTIONS` <img width=100/>     | Other [options](https://docs.ansible.com/ansible/latest/cli/ansible-playbook.html#common-options) you may want to use<img width=175/>             | ` ` <img width=100/>  |

jobs/trivy_image/README.md

+0 −1
Original line number Diff line number Diff line 
| `IMAGE_TAG` | The default tag for the docker image | `19.03-dind`  |

## Objective



Run a security issue detection in a docker image using

tools/job_template/r2_jobname/r2_jobname.yml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ stages: 
  - r2_stage



r2_jobname:

  image: r2_imagename:r2_imagetag

  image: r2_imagename:${IMAGE_TAG}

  stage: r2_stage

  variables:

    VARIABLE: "Hello R2"

tools/job_template/r2_jobname/README.md

+1 −1

File changed.

Contains only whitespace changes.