Merge branch 'master' into fc32

startxfr · May 19, 2021 · b4109e3 · b4109e3
2 parents c817b35 + 5679211
commit b4109e3
Show file tree

Hide file tree

Showing 19 changed files with 116 additions and 114 deletions.
diff --git a/GitlabRunner/ansible/sx/lib/sx-runner-ansible b/GitlabRunner/ansible/sx/lib/sx-runner-ansible
@@ -5,4 +5,6 @@ source $SX_LIBDIR/sx
 function runnerAnsibleInformation {
     genericAllInformation $1
     echoVerbose $1 "runner make : " `make --version | head -n 1`
-}
+    echoVerbose $1 "ansible     : " `ansible --version | head -n 1 | cut -d " " -f 2`
+    echoVerbose $1 "pythn       : " `python --version |cut -d " " -f 2`
+}
diff --git a/docs/GitlabRunner/ansible.md b/docs/GitlabRunner/ansible.md
@@ -9,22 +9,22 @@ based on [startx/fedora container](https://hub.docker.com/r/startx/fedora)
 
 ## Available flavours
 
-| Docker Hub repository                                                             | Content             | Ansible | Make |
-| --------------------------------------------------------------------------------- | ------------------- | ------- | ---- |
-| [`startx/runner-ansible:latest`](https://hub.docker.com/r/startx/runner-ansible)  | Fedora core rawhide |         | 4.3  |
-| [`startx/runner-ansible:34`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 34      |         |      |
-| [`startx/runner-ansible:33`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 33      |         |      |
-| [`startx/runner-ansible:32`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 32      |         |      |
-| [`startx/runner-ansible:31`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 31      |         |      |
-| [`startx/runner-ansible:30`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 30      |         |      |
-| [`startx/runner-ansible:29`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 29      |         |      |
-| [`startx/runner-ansible:28`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 28      |         |      |
-| [`startx/runner-ansible:27`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 27      |         |      |
-| [`startx/runner-ansible:centos8`](https://hub.docker.com/r/startx/runner-ansible) | Centos 8            |         |      |
-| [`startx/runner-ansible:centos7`](https://hub.docker.com/r/startx/runner-ansible) | Centos 7            |         |      |
-| [`startx/runner-ansible:centos6`](https://hub.docker.com/r/startx/runner-ansible) | Centos 6            |         |      |
-| [`startx/runner-ansible:ubi8`](https://hub.docker.com/r/startx/runner-ansible)    | RedHat UBI 8        |         |      |
-| [`startx/runner-ansible:alpine3`](https://hub.docker.com/r/startx/runner-ansible) | Alpine 3.12         |         |      |
+| Docker Hub repository                                                             | Content             | Ansible | Python | Make |
+| --------------------------------------------------------------------------------- | ------------------- | ------- | ------ | ---- |
+| [`startx/runner-ansible:latest`](https://hub.docker.com/r/startx/runner-ansible)  | Fedora core rawhide |         |        | 4.3  |
+| [`startx/runner-ansible:34`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 34      |         |        | 4.3  |
+| [`startx/runner-ansible:33`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 33      |         |        | 4.3  |
+| [`startx/runner-ansible:32`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 32      |         |        |      |
+| [`startx/runner-ansible:31`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 31      |         |        |      |
+| [`startx/runner-ansible:30`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 30      |         |        |      |
+| [`startx/runner-ansible:29`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 29      |         |        |      |
+| [`startx/runner-ansible:28`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 28      |         |        |      |
+| [`startx/runner-ansible:27`](https://hub.docker.com/r/startx/runner-ansible)      | Fedora core 27      |         |        |      |
+| [`startx/runner-ansible:centos8`](https://hub.docker.com/r/startx/runner-ansible) | Centos 8            |         |        |      |
+| [`startx/runner-ansible:centos7`](https://hub.docker.com/r/startx/runner-ansible) | Centos 7            |         |        |      |
+| [`startx/runner-ansible:centos6`](https://hub.docker.com/r/startx/runner-ansible) | Centos 6            |         |        |      |
+| [`startx/runner-ansible:ubi8`](https://hub.docker.com/r/startx/runner-ansible)    | RedHat UBI 8        |         |        |      |
+| [`startx/runner-ansible:alpine3`](https://hub.docker.com/r/startx/runner-ansible) | Alpine 3.12         |         |        |      |
 
 ## Running from dockerhub registry
 

diff --git a/docs/GitlabRunner/apache.md b/docs/GitlabRunner/apache.md
@@ -23,23 +23,23 @@ See more applications builders and sample on [startx docker images repository](h
 
 ## Container flavours
 
-| Docker Hub repository                                                           | Content             | Ansible | Apache |
-| ------------------------------------------------------------------------------- | ------------------- | ------- | ------ |
-| [`startx/runner-apache:latest`](https://hub.docker.com/r/startx/runner-apache)  | Fedora core rawhide |         | 2.4.46 |
-| [`startx/runner-apache:34`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 34      |         |        |
-| [`startx/runner-apache:33`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 33      |         |        |
-| [`startx/runner-apache:32`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 32      |         | 2.4.39 |
-| [`startx/runner-apache:31`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 31      |         | 2.4.39 |
-| [`startx/runner-apache:30`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 30      |         | 2.4.39 |
-| [`startx/runner-apache:29`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 29      |         | 2.4.39 |
-| [`startx/runner-apache:28`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 28      |         | 2.4.17 |
-| [`startx/runner-apache:27`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 27      |         | 2.4.17 |
-| [`startx/runner-apache:26`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 26      |         | 2.4.17 |
-| [`startx/runner-apache:centos8`](https://hub.docker.com/r/startx/runner-apache) | Centos 8            |         |        |
-| [`startx/runner-apache:centos7`](https://hub.docker.com/r/startx/runner-apache) | Centos 7            |         |        |
-| [`startx/runner-apache:centos6`](https://hub.docker.com/r/startx/runner-apache) | Centos 6            |         |        |
-| [`startx/runner-apache:ubi8`](https://hub.docker.com/r/startx/runner-apache)    | RedHat UBI 8        |         | 2.4.33 |
-| [`startx/runner-apache:alpine3`](https://hub.docker.com/r/startx/runner-apache) | Alpine 3.12         |         | 2.4.33 |
+| Docker Hub repository                                                           | Content             | Apache |
+| ------------------------------------------------------------------------------- | ------------------- | ------ |
+| [`startx/runner-apache:latest`](https://hub.docker.com/r/startx/runner-apache)  | Fedora core rawhide | 2.4.46 |
+| [`startx/runner-apache:34`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 34      | 2.4.46 |
+| [`startx/runner-apache:33`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 33      | 2.4.46 |
+| [`startx/runner-apache:32`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 32      | 2.4.39 |
+| [`startx/runner-apache:31`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 31      | 2.4.39 |
+| [`startx/runner-apache:30`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 30      | 2.4.39 |
+| [`startx/runner-apache:29`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 29      | 2.4.39 |
+| [`startx/runner-apache:28`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 28      | 2.4.17 |
+| [`startx/runner-apache:27`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 27      | 2.4.17 |
+| [`startx/runner-apache:26`](https://hub.docker.com/r/startx/runner-apache)      | Fedora core 26      | 2.4.17 |
+| [`startx/runner-apache:centos8`](https://hub.docker.com/r/startx/runner-apache) | Centos 8            |        |
+| [`startx/runner-apache:centos7`](https://hub.docker.com/r/startx/runner-apache) | Centos 7            |        |
+| [`startx/runner-apache:centos6`](https://hub.docker.com/r/startx/runner-apache) | Centos 6            |        |
+| [`startx/runner-apache:ubi8`](https://hub.docker.com/r/startx/runner-apache)    | RedHat UBI 8        | 2.4.33 |
+| [`startx/runner-apache:alpine3`](https://hub.docker.com/r/startx/runner-apache) | Alpine 3.12         | 2.4.33 |
 
 ## Running this image
 

diff --git a/docs/GitlabRunner/bash.md b/docs/GitlabRunner/bash.md
@@ -9,23 +9,23 @@ based on [startx/fedora container](https://hub.docker.com/r/startx/fedora)
 
 ## Available flavours
 
-| Docker Hub repository                                                       | Content             | Ansible | Make |
-| --------------------------------------------------------------------------- | ------------------- | ------- | ---- |
-| [`startx/runner-bash:latest`](https://hub.docker.com/r/startx/runner-bash)  | Fedora core rawhide |         | 4.3  |
-| [`startx/runner-bash:34`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 34      |         |      |
-| [`startx/runner-bash:33`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 33      |         |      |
-| [`startx/runner-bash:32`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 32      |         |      |
-| [`startx/runner-bash:31`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 31      |         |      |
-| [`startx/runner-bash:30`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 30      |         |      |
-| [`startx/runner-bash:29`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 29      |         |      |
-| [`startx/runner-bash:28`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 28      |         |      |
-| [`startx/runner-bash:27`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 27      |         |      |
-| [`startx/runner-bash:26`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 26      |         |      |
-| [`startx/runner-bash:centos8`](https://hub.docker.com/r/startx/runner-bash) | Centos 8            |         |      |
-| [`startx/runner-bash:centos7`](https://hub.docker.com/r/startx/runner-bash) | Centos 7            |         |      |
-| [`startx/runner-bash:centos6`](https://hub.docker.com/r/startx/runner-bash) | Centos 6            |         |      |
-| [`startx/runner-bash:ubi8`](https://hub.docker.com/r/startx/runner-bash)    | RedHat UBI 8        |         |      |
-| [`startx/runner-bash:alpine3`](https://hub.docker.com/r/startx/runner-bash) | Alpine 3.12         |         |      |
+| Docker Hub repository                                                       | Content             | Make |
+| --------------------------------------------------------------------------- | ------------------- | ---- |
+| [`startx/runner-bash:latest`](https://hub.docker.com/r/startx/runner-bash)  | Fedora core rawhide | 4.3  |
+| [`startx/runner-bash:34`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 34      | 4.3  |
+| [`startx/runner-bash:33`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 33      | 4.3  |
+| [`startx/runner-bash:32`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 32      |      |
+| [`startx/runner-bash:31`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 31      |      |
+| [`startx/runner-bash:30`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 30      |      |
+| [`startx/runner-bash:29`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 29      |      |
+| [`startx/runner-bash:28`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 28      |      |
+| [`startx/runner-bash:27`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 27      |      |
+| [`startx/runner-bash:26`](https://hub.docker.com/r/startx/runner-bash)      | Fedora core 26      |      |
+| [`startx/runner-bash:centos8`](https://hub.docker.com/r/startx/runner-bash) | Centos 8            |      |
+| [`startx/runner-bash:centos7`](https://hub.docker.com/r/startx/runner-bash) | Centos 7            |      |
+| [`startx/runner-bash:centos6`](https://hub.docker.com/r/startx/runner-bash) | Centos 6            |      |
+| [`startx/runner-bash:ubi8`](https://hub.docker.com/r/startx/runner-bash)    | RedHat UBI 8        |      |
+| [`startx/runner-bash:alpine3`](https://hub.docker.com/r/startx/runner-bash) | Alpine 3.12         |      |
 
 ## Running from dockerhub registry
 

diff --git a/docs/GitlabRunner/nodejs.md b/docs/GitlabRunner/nodejs.md
@@ -30,23 +30,23 @@ See more applications builders and sample on [startx docker images repository](h
 
 ## Container flavours
 
-| Docker Hub repository                                                           | Content             | Ansible | NodeJS  |
-| ------------------------------------------------------------------------------- | ------------------- | ------- | ------- |
-| [`startx/runner-nodejs:latest`](https://hub.docker.com/r/startx/runner-nodejs)  | Fedora core rawhide |         | 14.16.1 |
-| [`startx/runner-nodejs:34`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 34      |         | 14.16.1 |
-| [`startx/runner-nodejs:33`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 33      |         |         |
-| [`startx/runner-nodejs:32`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 32      |         | 12.4.0  |
-| [`startx/runner-nodejs:31`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 31      |         | 10.15.0 |
-| [`startx/runner-nodejs:30`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 30      |         | 10.15.0 |
-| [`startx/runner-nodejs:29`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 29      |         | 10.16.0 |
-| [`startx/runner-nodejs:28`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 28      |         | 0.10.36 |
-| [`startx/runner-nodejs:27`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 27      |         | 0.10.36 |
-| [`startx/runner-nodejs:26`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 26      |         |         |
-| [`startx/runner-nodejs:centos8`](https://hub.docker.com/r/startx/runner-nodejs) | Centos 8            |         |         |
-| [`startx/runner-nodejs:centos7`](https://hub.docker.com/r/startx/runner-nodejs) | Centos 7            |         |         |
-| [`startx/runner-nodejs:centos6`](https://hub.docker.com/r/startx/runner-nodejs) | Centos 6            |         |         |
-| [`startx/runner-nodejs:ubi8`](https://hub.docker.com/r/startx/runner-nodejs)    | RedHat UBI 8        |         |         |
-| [`startx/runner-nodejs:alpine3`](https://hub.docker.com/r/startx/runner-nodejs) | Alpine 3.12         |         | 8.11.1  |
+| Docker Hub repository                                                           | Content             | NodeJS  | NPM     | Make |
+| ------------------------------------------------------------------------------- | ------------------- | ------- | ------- | ---- |
+| [`startx/runner-nodejs:latest`](https://hub.docker.com/r/startx/runner-nodejs)  | Fedora core rawhide | 14.16.1 | 6.14.12 | 4.3  |
+| [`startx/runner-nodejs:34`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 34      | 14.16.1 | 6.14.12 | 4.3  |
+| [`startx/runner-nodejs:33`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 33      | 14.16.1 | 6.14.12 | 4.3  |
+| [`startx/runner-nodejs:32`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 32      | 12.4.0  |         |      |
+| [`startx/runner-nodejs:31`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 31      | 10.15.0 |         |      |
+| [`startx/runner-nodejs:30`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 30      | 10.15.0 |         |      |
+| [`startx/runner-nodejs:29`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 29      | 10.16.0 |         |      |
+| [`startx/runner-nodejs:28`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 28      | 0.10.36 |         |      |
+| [`startx/runner-nodejs:27`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 27      | 0.10.36 |         |      |
+| [`startx/runner-nodejs:26`](https://hub.docker.com/r/startx/runner-nodejs)      | Fedora core 26      |         |         |      |
+| [`startx/runner-nodejs:centos8`](https://hub.docker.com/r/startx/runner-nodejs) | Centos 8            |         |         |      |
+| [`startx/runner-nodejs:centos7`](https://hub.docker.com/r/startx/runner-nodejs) | Centos 7            |         |         |      |
+| [`startx/runner-nodejs:centos6`](https://hub.docker.com/r/startx/runner-nodejs) | Centos 6            |         |         |      |
+| [`startx/runner-nodejs:ubi8`](https://hub.docker.com/r/startx/runner-nodejs)    | RedHat UBI 8        |         |         |      |
+| [`startx/runner-nodejs:alpine3`](https://hub.docker.com/r/startx/runner-nodejs) | Alpine 3.12         | 8.11.1  |         |      |
 
 ## Running this image