diff options
author | startxfr <clarue@startx.fr> | 2017-07-23 13:56:39 +0200 |
---|---|---|
committer | startxfr <clarue@startx.fr> | 2017-07-23 13:56:39 +0200 |
commit | aec34cca4a69039bf300ad60e2b356936bad466a (patch) | |
tree | 548a1705b9bc0599bc4fa6cbbf604a44a5128aa0 | |
parent | baf7c43307fb29f5c19b237f418f4f1a59749c3c (diff) | |
download | phpmyadmin-aec34cca4a69039bf300ad60e2b356936bad466a.tar.gz phpmyadmin-aec34cca4a69039bf300ad60e2b356936bad466a.tar.bz2 phpmyadmin-aec34cca4a69039bf300ad60e2b356936bad466a.tar.xz phpmyadmin-aec34cca4a69039bf300ad60e2b356936bad466a.zip |
update dependency on bomb and add a test into centos image
-rw-r--r-- | Bombs/cpu/Dockerfile | 2 | ||||
-rw-r--r-- | Bombs/mem/Dockerfile | 2 | ||||
-rw-r--r-- | OS/sx.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Bombs/cpu/Dockerfile b/Bombs/cpu/Dockerfile index 2a37769..f289832 100644 --- a/Bombs/cpu/Dockerfile +++ b/Bombs/cpu/Dockerfile @@ -1,4 +1,4 @@ -FROM centos/s2i-core-centos7:latest +FROM startx/openshift-centos:latest MAINTAINER Christophe LARUE <dev@startx.fr> COPY sx.sh /bin/sx diff --git a/Bombs/mem/Dockerfile b/Bombs/mem/Dockerfile index 2a37769..f289832 100644 --- a/Bombs/mem/Dockerfile +++ b/Bombs/mem/Dockerfile @@ -1,4 +1,4 @@ -FROM centos/s2i-core-centos7:latest +FROM startx/openshift-centos:latest MAINTAINER Christophe LARUE <dev@startx.fr> COPY sx.sh /bin/sx @@ -1,7 +1,7 @@ #!/bin/bash export TERM=xterm pid=0 - +printenv function check_environment { if [ ! -v CONTAINER_TYPE ]; then CONTAINER_TYPE="unknown" |