diff options
| author | startxfr <clarue@startx.fr> | 2015-12-06 03:44:47 +0100 |
|---|---|---|
| committer | startxfr <clarue@startx.fr> | 2015-12-06 03:44:47 +0100 |
| commit | 1af7a22460dafe12f22f9b564d946f3d583f4cb0 (patch) | |
| tree | 3d13d49ba4f5d6ac8cb4532435898b911bdf5a02 /OS | |
| parent | b502829a772adb36d4786db369aa4d803eb7877c (diff) | |
| download | phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.tar.gz phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.tar.bz2 phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.tar.xz phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.zip | |
debuging images and improve startup display
Diffstat (limited to 'OS')
| -rw-r--r-- | OS/Dockerfile | 2 | ||||
| -rw-r--r-- | OS/README.md | 2 | ||||
| -rw-r--r-- | OS/sx-lib.sh | 12 |
3 files changed, 9 insertions, 7 deletions
diff --git a/OS/Dockerfile b/OS/Dockerfile index 769a43e..b38b1f3 100644 --- a/OS/Dockerfile +++ b/OS/Dockerfile @@ -5,7 +5,7 @@ USER root # Install minimal packages RUN dnf -y install deltarpm pwgen tar python-dnf-plugins-extras-migrate && \ dnf-2 migrate && \ - dnf -y install psmisc procps coreutils findutils wget logrotate zip && \ + dnf -y install psmisc procps coreutils findutils iputils net-tools wget logrotate zip && \ dnf clean all COPY *.sh /bin/ RUN chmod 775 /bin/sx-lib.sh /bin/run.sh && \ diff --git a/OS/README.md b/OS/README.md index 9efaeb7..556e3a8 100644 --- a/OS/README.md +++ b/OS/README.md @@ -20,7 +20,7 @@ This container contain updated core OS rpm (kernel, libs,...) as well as usefull | Version | Docker Hub repository | Fedora distribution | |------------|-------------------------------------------------------------------------|---------------------------------------------| -| Latest | [`startx/fedora:latest`](https://hub.docker.com/r/startx/fedora) | Fedora 23 (kernel 4.2 + GNU 3.18 ) | +| Latest | [`startx/fedora:latest`](https://hub.docker.com/r/startx/fedora) | Fedora 24 (kernel 4.2 + GNU 3.18 ) | | 23 | [`startx/fedora:23`](https://hub.docker.com/r/startx/fedora) | Fedora 23 (kernel 4.2 + GNU 3.18 ) | | 22 | [`startx/fedora:22`](https://hub.docker.com/r/startx/fedora) | Fedora 22 (kernel 4.0 + GNU 3.16 ) | | 21 | [`startx/fedora:21`](https://hub.docker.com/r/startx/fedora) | Fedora 21 (kernel 3.16 + GNU 3.14 ) | diff --git a/OS/sx-lib.sh b/OS/sx-lib.sh index 7d6aac2..0df6f9c 100644 --- a/OS/sx-lib.sh +++ b/OS/sx-lib.sh @@ -16,8 +16,10 @@ function check_environment { echo "! WARNING : auto-assigned value : $CONTAINER_SERVICE" fi if [ ! -v CONTAINER_INSTANCE ]; then - echo "ERROR : environment var CONTAINER_INSTANCE is missing. EXIT !!!" - exit 1; + CONTAINER_INSTANCE=$CONTAINER_TYPE "_" $CONTAINER_SERVICE; + export CONTAINER_INSTANCE; + echo "! WARNING : environment var CONTAINER_INSTANCE is missing..." + echo "! WARNING : auto-assigned value : $CONTAINER_INSTANCE" fi } @@ -28,12 +30,12 @@ function display_container_header { if [ -v CONTAINER_TYPE ]; then echo "| Type : $CONTAINER_TYPE" fi - if [ -v CONTAINER_INSTANCE ]; then - echo "| Instance : $CONTAINER_INSTANCE" - fi if [ -v CONTAINER_SERVICE ]; then echo "| Service : $CONTAINER_SERVICE" fi + if [ -v CONTAINER_INSTANCE ]; then + echo "| Instance : $CONTAINER_INSTANCE" + fi echo "+=====================================================" } |