Commit b3b025f7 authored by Thomas Boni's avatar Thomas Boni
Browse files

Merge branch '453-nmap-package-version-is-broken' into 'latest'

Resolve "[nmap] package version is broken"

Closes #453

See merge request r2devops/hub!272
parents a699c713 fd9907b0
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ if one of them should not be.

* Job name: `nmap`
* Docker image:
[`instrumentisto/nmap`](https://hub.docker.com/r/instrumentisto/nmaps)
[`instrumentisto/nmap`](https://hub.docker.com/r/instrumentisto/nmap)
* Default stage: `dynamic_tests`
* When: `always`

@@ -54,7 +54,7 @@ if one of them should not be.
| `NMAP_OPTIONS` | Additional options you may want for the scan (`man nmap`) | ` ` |
| `NMAP_OUTPUT` | Name for the XML output file for nmap | `nmap-report.xml` |
| `HTML_OUTPUT` | Name for the html file for the Merge Request Widget for this job | `nmap-report.html` |
| `LIBXSLT_VERSION` | Tool's version of LibXslt | `1.1.34-r0` |
| `LIBXSLT_VERSION` | Tool's version of LibXslt | `1.1.34-r1` |

### Artifacts

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ icon: 🛡
maintainer: FulcrandG
license: MIT
images:
  "instrumentisto/nmap": "7.91"
  "instrumentisto/nmap": "7.92"
tools:
  "xsltproc": "latest"
  "nmap": "latest"
+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ stages:

nmap:
  image:
    name: instrumentisto/nmap:7.91
    name: instrumentisto/nmap:7.92
    entrypoint: [""]
  stage: dynamic_tests
  variables:
@@ -12,7 +12,7 @@ nmap:
    NMAP_OPTIONS: ""
    NMAP_OUTPUT: "nmap-report.xml"
    HTML_OUTPUT: "nmap-report.html"
    LIBXSLT_VERSION: "1.1.34-r0"
    LIBXSLT_VERSION: "1.1.34-r1"
  script:
    - apk add --no-cache "libxslt=${LIBXSLT_VERSION}"
    - if [[ ! -z ${NMAP_SCRIPTS} ]]; then
+2 −0
Original line number Diff line number Diff line
* Upgrade `libxslt` default version
* Upgrade `instrumentisto/nmap` version to `7.92`