summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2017-07-23 14:32:04 +0200
committerstartxfr <clarue@startx.fr>2017-07-23 14:32:04 +0200
commite69891ce630b7f4d6ea1ee7b2abde0cdf942f6c1 (patch)
treef467860a43e15861efb514c2c51968a2409b5e3b
parent11621aff584557c0141cef87b6e229f382349e9e (diff)
downloadphpmyadmin-e69891ce630b7f4d6ea1ee7b2abde0cdf942f6c1.tar.gz
phpmyadmin-e69891ce630b7f4d6ea1ee7b2abde0cdf942f6c1.tar.bz2
phpmyadmin-e69891ce630b7f4d6ea1ee7b2abde0cdf942f6c1.tar.xz
phpmyadmin-e69891ce630b7f4d6ea1ee7b2abde0cdf942f6c1.zip
update openshift bomb for user issue
-rw-r--r--Bombs/cpu/Dockerfile5
-rw-r--r--Bombs/mem/Dockerfile5
-rw-r--r--OS/Dockerfile3
3 files changed, 10 insertions, 3 deletions
diff --git a/Bombs/cpu/Dockerfile b/Bombs/cpu/Dockerfile
index f289832..eb3c668 100644
--- a/Bombs/cpu/Dockerfile
+++ b/Bombs/cpu/Dockerfile
@@ -1,8 +1,11 @@
-FROM startx/openshift-centos:latest
+FROM centos/s2i-core-centos7:latest
MAINTAINER Christophe LARUE <dev@startx.fr>
COPY sx.sh /bin/sx
COPY bomb.sh /bin/bomb
RUN chmod 775 /bin/sx /bin/bomb
+RUN useradd startx && echo "startx" | passwd --stdin startx
+USER startx
+
CMD [ "/bin/sx" ]
diff --git a/Bombs/mem/Dockerfile b/Bombs/mem/Dockerfile
index f289832..eb3c668 100644
--- a/Bombs/mem/Dockerfile
+++ b/Bombs/mem/Dockerfile
@@ -1,8 +1,11 @@
-FROM startx/openshift-centos:latest
+FROM centos/s2i-core-centos7:latest
MAINTAINER Christophe LARUE <dev@startx.fr>
COPY sx.sh /bin/sx
COPY bomb.sh /bin/bomb
RUN chmod 775 /bin/sx /bin/bomb
+RUN useradd startx && echo "startx" | passwd --stdin startx
+USER startx
+
CMD [ "/bin/sx" ]
diff --git a/OS/Dockerfile b/OS/Dockerfile
index f04434e..1237603 100644
--- a/OS/Dockerfile
+++ b/OS/Dockerfile
@@ -3,7 +3,8 @@ MAINTAINER Christophe LARUE <dev@startx.fr>
COPY sx.sh /bin/sx
RUN chmod 775 /bin/sx
-RUN useradd startx && echo "startx" | passwd --stdin startx && usermod -aG wheel startx
+RUN useradd startx && echo "startx" | passwd --stdin startx
USER startx
+
CMD [ "/bin/sx" ]