Merge branch 'master' into centos8

startxfr · Dec 20, 2021 · 5af34a6 · 5af34a6
2 parents 2a54218 + b571cfe
commit 5af34a6
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 43 deletions.
diff --git a/.gitlab/ci/step-build-os.yaml b/.gitlab/ci/step-build-os.yaml
@@ -37,4 +37,10 @@ container_scanning:
   variables:
     GIT_STRATEGY: fetch
     SECURE_LOG_LEVEL: debug
-    DOCKER_IMAGE: "quay.io/startx/${SXGLCI_OSNAME}:${SXGLCI_OSTAG}"
+    DOCKER_IMAGE: "quay.io/startx/${SXGLCI_OSNAME}:${SXGLCI_OSTAG}"
+  only:
+    - centos8
+    # - alma
+    # - rocky
+    - alpine
+    - ubi8
diff --git a/.gitlab/ci/step-build-services.yaml b/.gitlab/ci/step-build-services.yaml
@@ -158,7 +158,6 @@ build-ooconv:
     - centos6
     - alma8
     - rocky8
-    - ubi8
     - fc36
     - fc35
     - fc34

diff --git a/docs/OS/README.md b/docs/OS/README.md
@@ -7,6 +7,8 @@ Various container images with OS and common tools. Used as a basic layer for ser
 | **Fedora** | [guide](https://docker-images.readthedocs.io/en/latest/OS/fedora) | [OS list](https://docker-images.readthedocs.io/en/latest/OS/fedora#container-flavours) | [examples](https://docker-images.readthedocs.io/en/latest/OS/fedora#running-this-image) |
 | **Centos** | [guide](https://docker-images.readthedocs.io/en/latest/OS/centos) | [OS list](https://docker-images.readthedocs.io/en/latest/OS/centos#container-flavours) | [examples](https://docker-images.readthedocs.io/en/latest/OS/centos#running-this-image) |
 | **UBI**    | [guide](https://docker-images.readthedocs.io/en/latest/OS/ubi)    | [OS list](https://docker-images.readthedocs.io/en/latest/OS/ubi#container-flavours)    | [examples](https://docker-images.readthedocs.io/en/latest/OS/ubi#running-this-image)    |
+| **Alma**   | [guide](https://docker-images.readthedocs.io/en/latest/OS/alma)   | [OS list](https://docker-images.readthedocs.io/en/latest/OS/alma#container-flavours)   | [examples](https://docker-images.readthedocs.io/en/latest/OS/alma#running-this-image)   |
+| **Rocky**  | [guide](https://docker-images.readthedocs.io/en/latest/OS/rocky)  | [OS list](https://docker-images.readthedocs.io/en/latest/OS/rocky#container-flavours)  | [examples](https://docker-images.readthedocs.io/en/latest/OS/rocky#running-this-image)  |
 | **Alpine** | [guide](https://docker-images.readthedocs.io/en/latest/OS/alpine) | [OS list](https://docker-images.readthedocs.io/en/latest/OS/alpine#container-flavours) | [examples](https://docker-images.readthedocs.io/en/latest/OS/alpine#running-this-image) |
 
 ## Container flavours
@@ -28,13 +30,13 @@ Various container images with OS and common tools. Used as a basic layer for ser
 
 ### Alma
 
-- `latest` based on alma rawhide [see detail](https://docker-images.readthedocs.io/en/alma8)
-- `8` based on alma linux 8 [see detail](https://docker-images.readthedocs.io/en/alma8/OS)
+- `latest` based on alma rawhide [see detail](https://docker-images.readthedocs.io/en/alma/OS/alma)
+- `8` based on alma linux 8 [see detail](https://docker-images.readthedocs.io/en/alma/OS/alma)
 
 ### Rocky
 
-- `latest` based on alma rawhide [see detail](https://docker-images.readthedocs.io/en/rocky8)
-- `8` based on alma linux 8 [see detail](https://docker-images.readthedocs.io/en/rocky8/OS)
+- `latest` based on alma rawhide [see detail](https://docker-images.readthedocs.io/en/rocky/OS/rocky)
+- `8` based on alma linux 8 [see detail](https://docker-images.readthedocs.io/en/rocky/OS/rocky)
 
 ### Centos
 

diff --git a/docs/OS/alma.md b/docs/OS/alma.md
@@ -38,9 +38,9 @@ See more applications builders and sample on [startx docker images repository](h
 
 ## Container flavours
 
-| Docker Hub repository                                            | Distribution        | Bash   | Kernel      |
-| ---------------------------------------------------------------- | ------------------- | ------ | ----------- |
-| [`startx/alma:8`](https://hub.docker.com/r/startx/alma)      | Alma 8            | 4.4.19 |             |
+| Docker Hub repository                                   | Distribution | Bash   | Kernel |
+| ------------------------------------------------------- | ------------ | ------ | ------ |
+| [`startx/alma:8`](https://hub.docker.com/r/startx/alma) | Alma 8       | 4.4.19 |        |
 
 ## Running this image
 
@@ -187,20 +187,20 @@ FROM quay.io/startx/alma:latest
 
 ## Environment variable
 
-| Variable              | Type     | Default         | Description                                                              |
-| --------------------- | -------- | --------------- | ------------------------------------------------------------------------ |
-| SX_VERSION            | `string` | `latest`        | container version                                                        |
-| SX_TYPE               | `string` | `OS`            | Container family (os, service, application). could be enhanced           |
+| Variable              | Type     | Default       | Description                                                              |
+| --------------------- | -------- | ------------- | ------------------------------------------------------------------------ |
+| SX_VERSION            | `string` | `latest`      | container version                                                        |
+| SX_TYPE               | `string` | `OS`          | Container family (os, service, application). could be enhanced           |
 | SX_SERVICE            | `string` | `alma`        | Define the type of service or application provided                       |
 | SX_ID                 | `auto`   | `startx/alma` | Container ID coresponding to the image repository                        |
-| SX_NAME               | `auto`   | `yes`           | Container name                                                           |
-| SX_SUMMARY            | `auto`   | `yes`           | Container purpose description                                            |
-| SX_VERBOSE            | `bool`   | `no`            | Display information about the execution                                  |
-| SX_DEBUG              | `bool`   | `no`            | Display debug informations during execution                              |
-| APP_PATH              | `string` | `/app`          | Path to the application                                                  |
-| SX_S2IDIR             | `string` | `/tmp`          | Destination path to the application pushed via s2i process               |
-| DAEMON_STOP_TIMEOUT   | `int`    | 3               | Number of second before stopping when smooth shutdown signal is received |
-| DAEMON_START_INTERVAL | `int`    | 10              | Hearthbeat rythm (in second) for the startx default daemeon              |
+| SX_NAME               | `auto`   | `yes`         | Container name                                                           |
+| SX_SUMMARY            | `auto`   | `yes`         | Container purpose description                                            |
+| SX_VERBOSE            | `bool`   | `no`          | Display information about the execution                                  |
+| SX_DEBUG              | `bool`   | `no`          | Display debug informations during execution                              |
+| APP_PATH              | `string` | `/app`        | Path to the application                                                  |
+| SX_S2IDIR             | `string` | `/tmp`        | Destination path to the application pushed via s2i process               |
+| DAEMON_STOP_TIMEOUT   | `int`    | 3             | Number of second before stopping when smooth shutdown signal is received |
+| DAEMON_START_INTERVAL | `int`    | 10            | Hearthbeat rythm (in second) for the startx default daemeon              |
 
 ## Container command
 

diff --git a/docs/OS/centos.md b/docs/OS/centos.md
@@ -38,13 +38,13 @@ See more applications builders and sample on [startx docker images repository](h
 
 ## Container flavours
 
-| Docker Hub repository                                       | Distribution | Bash   |
-| ----------------------------------------------------------- | ------------ | ------ |
-| [`startx/centos:8`](https://hub.docker.com/r/startx/centos) | Centos 8     | 4.4.19 |
-| [`startx/centos:7`](https://hub.docker.com/r/startx/centos) | Centos 7     | 4.2.46 |
-| [`startx/centos:6`](https://hub.docker.com/r/startx/centos) | Centos 6     | 4.1.2  |
-| [`startx/ubi:8`](https://hub.docker.com/r/startx/ubi)       | RedHat UBI 8 | 4.4.19 |
-| [`startx/alpine:3`](https://hub.docker.com/r/startx/alpine) | Alpine 3.12  | 5.0.17 |
+| Docker Hub repository                                       | Distribution | Bash   | Kernel |
+| ----------------------------------------------------------- | ------------ | ------ | ------ |
+| [`startx/centos:8`](https://hub.docker.com/r/startx/centos) | Centos 8     | 4.4.19 |        |
+| [`startx/centos:7`](https://hub.docker.com/r/startx/centos) | Centos 7     | 4.2.46 |        |
+| [`startx/centos:6`](https://hub.docker.com/r/startx/centos) | Centos 6     | 4.1.2  |        |
+| [`startx/ubi:8`](https://hub.docker.com/r/startx/ubi)       | RedHat UBI 8 | 4.4.19 |        |
+| [`startx/alpine:3`](https://hub.docker.com/r/startx/alpine) | Alpine 3.12  | 5.0.17 |        |
 
 ## Running this image
 

diff --git a/docs/OS/rocky.md b/docs/OS/rocky.md
@@ -38,9 +38,9 @@ See more applications builders and sample on [startx docker images repository](h
 
 ## Container flavours
 
-| Docker Hub repository                                            | Distribution        | Bash   | Kernel      |
-| ---------------------------------------------------------------- | ------------------- | ------ | ----------- |
-| [`startx/rocky:8`](https://hub.docker.com/r/startx/rocky)      | Rocky 8            | 4.4.19 |             |
+| Docker Hub repository                                     | Distribution | Bash   | Kernel |
+| --------------------------------------------------------- | ------------ | ------ | ------ |
+| [`startx/rocky:8`](https://hub.docker.com/r/startx/rocky) | Rocky 8      | 4.4.19 |        |
 
 ## Running this image
 
@@ -187,20 +187,20 @@ FROM quay.io/startx/rocky:latest
 
 ## Environment variable
 
-| Variable              | Type     | Default         | Description                                                              |
-| --------------------- | -------- | --------------- | ------------------------------------------------------------------------ |
-| SX_VERSION            | `string` | `latest`        | container version                                                        |
-| SX_TYPE               | `string` | `OS`            | Container family (os, service, application). could be enhanced           |
+| Variable              | Type     | Default        | Description                                                              |
+| --------------------- | -------- | -------------- | ------------------------------------------------------------------------ |
+| SX_VERSION            | `string` | `latest`       | container version                                                        |
+| SX_TYPE               | `string` | `OS`           | Container family (os, service, application). could be enhanced           |
 | SX_SERVICE            | `string` | `rocky`        | Define the type of service or application provided                       |
 | SX_ID                 | `auto`   | `startx/rocky` | Container ID coresponding to the image repository                        |
-| SX_NAME               | `auto`   | `yes`           | Container name                                                           |
-| SX_SUMMARY            | `auto`   | `yes`           | Container purpose description                                            |
-| SX_VERBOSE            | `bool`   | `no`            | Display information about the execution                                  |
-| SX_DEBUG              | `bool`   | `no`            | Display debug informations during execution                              |
-| APP_PATH              | `string` | `/app`          | Path to the application                                                  |
-| SX_S2IDIR             | `string` | `/tmp`          | Destination path to the application pushed via s2i process               |
-| DAEMON_STOP_TIMEOUT   | `int`    | 3               | Number of second before stopping when smooth shutdown signal is received |
-| DAEMON_START_INTERVAL | `int`    | 10              | Hearthbeat rythm (in second) for the startx default daemeon              |
+| SX_NAME               | `auto`   | `yes`          | Container name                                                           |
+| SX_SUMMARY            | `auto`   | `yes`          | Container purpose description                                            |
+| SX_VERBOSE            | `bool`   | `no`           | Display information about the execution                                  |
+| SX_DEBUG              | `bool`   | `no`           | Display debug informations during execution                              |
+| APP_PATH              | `string` | `/app`         | Path to the application                                                  |
+| SX_S2IDIR             | `string` | `/tmp`         | Destination path to the application pushed via s2i process               |
+| DAEMON_STOP_TIMEOUT   | `int`    | 3              | Number of second before stopping when smooth shutdown signal is received |
+| DAEMON_START_INTERVAL | `int`    | 10             | Hearthbeat rythm (in second) for the startx default daemeon              |
 
 ## Container command