Merge branch 'master' into centos8

startxfr · Dec 19, 2021 · adbe273 · adbe273
2 parents f25d0e7 + 64e6548
commit adbe273
Show file tree

Hide file tree

Showing 72 changed files with 1,468 additions and 91 deletions.
diff --git a/.gitlab/ci/get-release.sh b/.gitlab/ci/get-release.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-IMGLIST="latest fc36 fc35 fc34 fc33 fc32 fc31 fc30 fc29 fc28 fc27 fc26 fc23 fc22 alpine3 centos8 centos7 centos6 ubi8"
+IMGLIST="latest fc36 fc35 fc34 fc33 fc32 fc31 fc30 fc29 fc28 fc27 fc26 fc23 fc22 alpine3 alma8 rocky8 centos8 centos7 centos6 ubi8"
 IMGLISTFC="latest 35 34 33 32 31 30 29 28 27 26 23 22"
 IMGLISTCENTOS="latest 8 7 6"
 IMGLISTALPINE="latest 3"

diff --git a/.gitlab/ci/step-build-application.yaml b/.gitlab/ci/step-build-application.yaml
@@ -14,6 +14,8 @@ build-application-phpmyadmin:
     SXGLCI_TAG: ${SXGLCI_OTHERTAG}
   only:
     - master
+    - alma8
+    - rocky8
     - centos8
     - centos7
     - centos6

diff --git a/.gitlab/ci/step-build-basic.yaml b/.gitlab/ci/step-build-basic.yaml
@@ -16,6 +16,8 @@ build-apache:
     - centos8
     - centos7
     - centos6
+    - alma8
+    - rocky8
     - alpine
     - ubi8
     - fc36
@@ -51,6 +53,8 @@ build-nodejs:
     - centos8
     - centos7
     - centos6
+    - alma8
+    - rocky8
     - alpine
     - ubi8
     - fc36
@@ -85,6 +89,8 @@ build-runner-bash:
     - master
     - centos8
     - centos7
+    - alma8
+    - rocky8
     - alpine
     - ubi8
     - fc36

diff --git a/.gitlab/ci/step-build-os.yaml b/.gitlab/ci/step-build-os.yaml
@@ -23,6 +23,8 @@ build-os-latest:
     SXGLCI_TAG: latest
   only:
     - centos8
+    - alma8
+    - rocky8
     - alpine
     - ubi8
 

diff --git a/.gitlab/ci/step-build-runners.yaml b/.gitlab/ci/step-build-runners.yaml
@@ -16,6 +16,8 @@ build-runner-ansible:
     - master
     - centos8
     - centos7
+    - alma8
+    - rocky8
     - alpine
     - ubi8
     - fc36
@@ -44,6 +46,8 @@ build-runner-apache:
     - master
     - centos8
     - centos7
+    - alma8
+    - rocky8
     - alpine
     - ubi8
     - fc36
@@ -72,6 +76,8 @@ build-runner-nodejs:
     - master
     - centos8
     - centos7
+    - alma8
+    - rocky8
     - alpine
     - ubi8
     - fc36
@@ -100,6 +106,8 @@ build-runner-oc:
     - master
     - centos8
     - centos7
+    - alma8
+    - rocky8
     - alpine
     - ubi8
     - fc36
@@ -127,6 +135,8 @@ build-runner-php:
     - master
     - centos8
     - centos7
+    - alma8
+    - rocky8
     - alpine
     - ubi8
     - fc36

diff --git a/.gitlab/ci/step-build-services.yaml b/.gitlab/ci/step-build-services.yaml
@@ -17,6 +17,8 @@ build-couchbase:
     - centos8
     - centos7
     - centos6
+    - alma8
+    - rocky8
     - ubi8
     - fc36
     - fc35
@@ -45,6 +47,8 @@ build-mariadb:
     - centos8
     - centos7
     - centos6
+    - alma8
+    - rocky8
     - alpine
     - ubi8
     - fc36
@@ -78,6 +82,8 @@ build-memcache:
     - centos8
     - centos7
     - centos6
+    - alma8
+    - rocky8
     - alpine
     - ubi8
     - fc36
@@ -113,6 +119,8 @@ build-mongo:
     - centos8
     - centos7
     - centos6
+    - alma8
+    - rocky8
     - alpine
     - ubi8
     - fc36
@@ -148,6 +156,8 @@ build-ooconv:
     - centos8
     - centos7
     - centos6
+    - alma8
+    - rocky8
     - ubi8
     - fc36
     - fc35
@@ -180,6 +190,8 @@ build-php:
     - centos8
     - centos7
     - centos6
+    - alma8
+    - rocky8
     - alpine
     - ubi8
     - fc36
@@ -214,6 +226,8 @@ build-postgres:
     - centos8
     - centos7
     - centos6
+    - alma8
+    - rocky8
     - alpine
     - ubi8
     - fc36

diff --git a/.gitlab/ci/step-build-vdi.yaml b/.gitlab/ci/step-build-vdi.yaml
@@ -16,6 +16,8 @@ build-vdi-chrome:
     - master
     - centos8
     - centos7
+    - alma8
+    - rocky8
     - alpine
     - fc36
     - fc35
@@ -41,6 +43,8 @@ build-vdi-firefox:
     - master
     - centos8
     - centos7
+    - alma8
+    - rocky8
     - alpine
     - fc36
     - fc35

diff --git a/.gitlab/ci/step-check.yaml b/.gitlab/ci/step-check.yaml
@@ -32,6 +32,8 @@ markdown:
     - centos8
     - centos7
     - centos6
+    - alma8
+    - rocky8
     - alpine
     - ubi8
     - fc36

diff --git a/Applications/README.md b/Applications/README.md
@@ -3,7 +3,7 @@
 # STARTX Docker-Images Application Repository
 
 [![STARTX Profile](https://img.shields.io/badge/provider-startx-green.svg)](https://github.com/startxfr) [![licence](https://img.shields.io/github/license/startxfr/docker-images.svg)](https://gitlab.com/startx1/containers) [![Sources](https://img.shields.io/badge/startxfr-docker--images-blue.svg)](https://gitlab.com/startx1/containers/tree/master/)
- 
+
 [![last commit](https://img.shields.io/github/last-commit/startxfr/docker-images.svg)](https://gitlab.com/startx1/containers) [![Build Status](https://travis-ci.org/startxfr/docker-images.svg?branch=master)](https://travis-ci.org/startxfr/docker-images)
 
 This directory host various Open Source applications into docker containers based on [startx/fedora container](https://hub.docker.com/r/startx/fedora)
@@ -22,19 +22,19 @@ your project and start using stable or experimental applications in your applica
 
 ## Available services
 
-| Service        | Docker.io                                                               | Quay.io                                                           | Docs                          |
-| -------------- | ----------------------------------------------------------------------- | ----------------------------------------------------------------- | ----------------------------- |
-| **PhpMyAdmin** | [`startx/app-pma`](https://hub.docker.com/r/startx/app-pma)             | [`startx/pma`](https://quay.io/repository/startx/pma)             | [manual](pma/README.md)       |
+| Service        | Docker.io                                                   | Quay.io                                               | Docs                    |
+| -------------- | ----------------------------------------------------------- | ----------------------------------------------------- | ----------------------- |
+| **PhpMyAdmin** | [`startx/app-pma`](https://hub.docker.com/r/startx/app-pma) | [`startx/pma`](https://quay.io/repository/startx/pma) | [manual](pma/README.md) |
 
 ## Available Flavours
 
-| Service        | Fedora flavours                                                                                                                                      | CentOS flavours | Alpine | UBI |
-| -------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- | ------ | --- |
-| **PhpMyAdmin** | `:latest` `:fc23` ` :fc24``:fc25 ` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` `:fc32` `:fc33` `:fc34` | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` |
-| **RockMongo**  | `:latest` `:fc23` ` :fc24``:fc25 ` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` `:fc32` `:fc33` `:fc34` | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` |
+| Service        | Fedora flavours                                                                                            | CentOS flavours                                     | Alpine     | UBI     |
+| -------------- | ---------------------------------------------------------------------------------------------------------- | --------------------------------------------------- | ---------- | ------- |
+| **PhpMyAdmin** | `:latest` `:fc23` ` :fc24``:fc25 ` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` `:fc32` `:fc33` `:fc34` | `:centos6` `:centos7` `:centos8` `:alma8` `:rocky8` | `:alpine3` | `:ubi8` |
+| **RockMongo**  | `:latest` `:fc23` ` :fc24``:fc25 ` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` `:fc32` `:fc33` `:fc34` | `:centos6` `:centos7` `:centos8` `:alma8` `:rocky8` | `:alpine3` | `:ubi8` |
 
 ## Running from dockerhub registry
 
-| Applications   | Command                                                          |
-| -------------- | ---------------------------------------------------------------- |
-| **PhpMyAdmin** | `docker run -d -p 80:80 --name="pma" startx/app-pma`             |
+| Applications   | Command                                              |
+| -------------- | ---------------------------------------------------- |
+| **PhpMyAdmin** | `docker run -d -p 80:80 --name="pma" startx/app-pma` |
diff --git a/Applications/phpmyadmin/openshift-imageStreams.json b/Applications/phpmyadmin/openshift-imageStreams.json
@@ -131,6 +131,38 @@
                             "name": "startx/app-phpmyadmin:latest"
                         }
                     },
+                    {
+                        "name": "alma8",
+                        "annotations": {
+                            "openshift.io/display-name": "PhpMyAdmin web-console (Alma 8)",
+                            "description": "PhpMyAdmin web-console for mariadb running under Alma 8",
+                            "iconClass": "icon-php",
+                            "tags": "startx,alma,apache,httpd,php,phpmyadmin,pma,db,database,mariadb,mysql",
+                            "supports": "http",
+                            "version": "8",
+                            "sampleRepo": "https://gitlab.com/startx1/containers-example-mariadb.git"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "startx/app-phpmyadmin:alma8"
+                        }
+                    },
+                    {
+                        "name": "rocky8",
+                        "annotations": {
+                            "openshift.io/display-name": "PhpMyAdmin web-console (Rocky 8)",
+                            "description": "PhpMyAdmin web-console for mariadb running under Rocky 8",
+                            "iconClass": "icon-php",
+                            "tags": "startx,fedora,rocky,httpd,php,phpmyadmin,pma,db,database,mariadb,mysql",
+                            "supports": "http",
+                            "version": "8",
+                            "sampleRepo": "https://gitlab.com/startx1/containers-example-mariadb.git"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "startx/app-phpmyadmin:rocky8"
+                        }
+                    },
                     {
                         "name": "centos8",
                         "annotations": {

diff --git a/GitlabRunner/php/README.md b/GitlabRunner/php/README.md
@@ -39,6 +39,8 @@ See more applications builders and sample on [startx docker images repository](h
 | [`startx/runner-php:29`](https://hub.docker.com/r/startx/runner-php)      | [`compose`](https://raw.githubusercontent.com/startxfr/docker-images/master/GitlabRunner/php/docker-compose.yml) | Fedora core 29 + Apache 2.4.39 + PHP 7.2.20     |
 | [`startx/runner-php:28`](https://hub.docker.com/r/startx/runner-php)      | [`compose`](https://raw.githubusercontent.com/startxfr/docker-images/master/GitlabRunner/php/docker-compose.yml) | Fedora core 28 + Apache 2.4.17 + PHP 5.6.16     |
 | [`startx/runner-php:27`](https://hub.docker.com/r/startx/runner-php)      | [`compose`](https://raw.githubusercontent.com/startxfr/docker-images/master/GitlabRunner/php/docker-compose.yml) | Fedora core 27 + Apache 2.4.17 + PHP 5.6.16     |
+| [`startx/runner-php:alma8`](https://hub.docker.com/r/startx/runner-php) | [`compose`](https://raw.githubusercontent.com/startxfr/docker-images/master/GitlabRunner/php/docker-compose.yml) | Alma 8                                        |
+| [`startx/runner-php:rocky8`](https://hub.docker.com/r/startx/runner-php) | [`compose`](https://raw.githubusercontent.com/startxfr/docker-images/master/GitlabRunner/php/docker-compose.yml) | Rocky 8                                        |
 | [`startx/runner-php:centos8`](https://hub.docker.com/r/startx/runner-php) | [`compose`](https://raw.githubusercontent.com/startxfr/docker-images/master/GitlabRunner/php/docker-compose.yml) | Centos 8                                        |
 | [`startx/runner-php:centos7`](https://hub.docker.com/r/startx/runner-php) | [`compose`](https://raw.githubusercontent.com/startxfr/docker-images/master/GitlabRunner/php/docker-compose.yml) | Centos 7                                        |
 | [`startx/runner-php:centos6`](https://hub.docker.com/r/startx/runner-php) | [`compose`](https://raw.githubusercontent.com/startxfr/docker-images/master/GitlabRunner/php/docker-compose.yml) | Centos 6                                        |

diff --git a/OS/openshift-imageStreams.yml b/OS/openshift-imageStreams.yml
@@ -150,6 +150,30 @@ items:
           from:
             kind: DockerImage
             name: startx/ubi:8
+        - name: alma8
+          annotations:
+            openshift.io/display-name: S2I Startx Alma 8
+            description: Minimal Alma 8 OS builder for bash operations
+            iconClass: icon-beaker
+            tags: builder,startx,alma
+            supports: alma
+            version: "8"
+            sampleRepo: https://gitlab.com/startx1/containers-example-bash.git
+          from:
+            kind: DockerImage
+            name: startx/alma:8
+        - name: rocky8
+          annotations:
+            openshift.io/display-name: S2I Startx Rocky 8
+            description: Minimal Rocky 8 OS builder for bash operations
+            iconClass: icon-beaker
+            tags: builder,startx,rocky
+            supports: rocky
+            version: "8"
+            sampleRepo: https://gitlab.com/startx1/containers-example-bash.git
+          from:
+            kind: DockerImage
+            name: startx/rocky:8
         - name: centos8
           annotations:
             openshift.io/display-name: S2I Startx CentOS 8

diff --git a/OS/openshift-template-build.yml b/OS/openshift-template-build.yml
@@ -171,6 +171,30 @@ objects:
           from:
             kind: DockerImage
             name: startx/ubi:8
+        - name: alma8
+          annotations:
+            openshift.io/display-name: S2I Startx Alma 8
+            description: Minimal Alma 8 OS builder for bash operations
+            iconClass: icon-beaker
+            tags: builder,startx,alma
+            supports: alma
+            version: "8"
+            sampleRepo: https://gitlab.com/startx1/containers-example-bash.git
+          from:
+            kind: DockerImage
+            name: startx/alma:8
+        - name: rocky8
+          annotations:
+            openshift.io/display-name: S2I Startx Rocky 8
+            description: Minimal Rocky 8 OS builder for bash operations
+            iconClass: icon-beaker
+            tags: builder,startx,rocky
+            supports: rocky
+            version: "8"
+            sampleRepo: https://gitlab.com/startx1/containers-example-bash.git
+          from:
+            kind: DockerImage
+            name: startx/rocky:8
         - name: centos8
           annotations:
             openshift.io/display-name: S2I Startx CentOS 8
@@ -495,7 +519,7 @@ parameters:
     required: true
   - name: BUILDER_TAG
     displayName: Builder image stage
-    description: "Image tag of the startx apache builder image used. Could be : latest, dev, test, preprod, prod - rawhide, fc31, fc30, fc29, fc28 - alpine3 - centos8, centos7, centos6)"
+    description: "Image tag of the startx apache builder image used. Could be : latest, dev, test, preprod, prod - rawhide, fc31, fc30, fc29, fc28 - alpine3 - centos8, centos7, centos6, alma8, rocky8)"
     value: latest
   - name: SOURCE_GIT
     displayName: Source repository

diff --git a/Services/README.md b/Services/README.md
@@ -34,17 +34,17 @@ your project and start using stable or experimental services in your application
 
 ## Available Flavours
 
-| Service        | Fedora flavours                                                                                                 | CentOS flavours                  | Alpine     | UBI     |
-| -------------- | --------------------------------------------------------------------------------------------------------------- | -------------------------------- | ---------- | ------- |
-| **Apache**     | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` `:fc32``:fc33``:fc34` | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` |
-| **MariaDB**    | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` `:fc32``:fc33``:fc34` | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` |
-| **Memcache**   | `:latest` `:fc21` `:fc22` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` `:fc32``:fc33``:fc34`         | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` |
-| **MongoDB**    | `:latest` `:fc22` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` `:fc32``:fc33``:fc34`                 | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` |
-| **nodejs**     | `:latest` `:fc21` `:fc22` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` `:fc32``:fc33``:fc34`         | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` |
-| **ooconv**     | `:latest` `:fc21` `:fc22` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` `:fc32``:fc33``:fc34`         | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` |
-| **php**        | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` `:fc32``:fc33``:fc34` | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` |
-| **postgreSQL** | `:latest` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` `:fc32``:fc33``:fc34`                         | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` |
-| **Couchbase**  | `:latest` `:fc29` `:fc30` `:fc31` `:fc32``:fc33``:fc34`                                                         | `:centos7` `:centos8`            |            | `:ubi8` |
+| Service        | Fedora flavours                                                                                                   | CentOS flavours                  | Alpine     | UBI     | Alma     | Rocky     |
+| -------------- | ----------------------------------------------------------------------------------------------------------------- | -------------------------------- | ---------- | ------- | -------- | --------- |
+| **Apache**     | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` ` :fc32``:fc33``:fc34 ` | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` | `:alma8` | `:rocky8` |
+| **MariaDB**    | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` ` :fc32``:fc33``:fc34 ` | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` | `:alma8` | `:rocky8` |
+| **Memcache**   | `:latest` `:fc21` `:fc22` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` ` :fc32``:fc33``:fc34 `         | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` | `:alma8` | `:rocky8` |
+| **MongoDB**    | `:latest` `:fc22` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` ` :fc32``:fc33``:fc34 `                 | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` | `:alma8` | `:rocky8` |
+| **nodejs**     | `:latest` `:fc21` `:fc22` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` ` :fc32``:fc33``:fc34 `         | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` | `:alma8` | `:rocky8` |
+| **ooconv**     | `:latest` `:fc21` `:fc22` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` ` :fc32``:fc33``:fc34 `         | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` | `:alma8` | `:rocky8` |
+| **php**        | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` ` :fc32``:fc33``:fc34 ` | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` | `:alma8` | `:rocky8` |
+| **postgreSQL** | `:latest` `:fc23` `:fc26` `:fc27` `:fc28` `:fc29` `:fc30` `:fc31` ` :fc32``:fc33``:fc34 `                         | `:centos6` `:centos7` `:centos8` | `:alpine3` | `:ubi8` | `:alma8` | `:rocky8` |
+| **Couchbase**  | `:latest` `:fc29` `:fc30` `:fc31` ` :fc32``:fc33``:fc34 `                                                         | `:centos7` `:centos8`            |            | `:ubi8` | `:alma8` | `:rocky8` | 
 
 ## Running from dockerhub registry