summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2017-07-23 13:56:39 +0200
committerstartxfr <clarue@startx.fr>2017-07-23 13:56:39 +0200
commitaec34cca4a69039bf300ad60e2b356936bad466a (patch)
tree548a1705b9bc0599bc4fa6cbbf604a44a5128aa0
parentbaf7c43307fb29f5c19b237f418f4f1a59749c3c (diff)
downloadphpmyadmin-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/Dockerfile2
-rw-r--r--Bombs/mem/Dockerfile2
-rw-r--r--OS/sx.sh2
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
diff --git a/OS/sx.sh b/OS/sx.sh
index 37539fc..96a8448 100644
--- a/OS/sx.sh
+++ b/OS/sx.sh
@@ -1,7 +1,7 @@
#!/bin/bash
export TERM=xterm
pid=0
-
+printenv
function check_environment {
if [ ! -v CONTAINER_TYPE ]; then
CONTAINER_TYPE="unknown"