#307 change default user id of Docker images to 1000, update Docker…

… images to latest VNC base image `1.3.0`
ConSol · Mar 27, 2018 · 3c86d2a · 3c86d2a
1 parent be37b37
commit 3c86d2a
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 21 deletions.
diff --git a/docker/Dockerfile.sakuli.centos.icewm b/docker/Dockerfile.sakuli.centos.icewm
@@ -1,6 +1,6 @@
 # This Dockerfile is used to build a sakuli image based on CentOS
 
-FROM consol/centos-icewm-vnc:1.2.3
+FROM consol/centos-icewm-vnc:1.3.0
 
 MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
 ENV REFRESHED_AT 2017-12-18
@@ -55,7 +55,7 @@ RUN $INST_SCRIPTS/sakuli.sh
 ADD ./sakuli-client/src/common/scripts $STARTUPDIR
 RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
-USER 1984
+USER 1000
 
 ### Sakuli startup script
 # no parameters:

diff --git a/docker/Dockerfile.sakuli.centos.icewm.java b/docker/Dockerfile.sakuli.centos.icewm.java
@@ -1,6 +1,6 @@
 # This Dockerfile is used to build a sakuli image based on CentOS
 
-FROM consol/centos-icewm-vnc:1.2.3
+FROM consol/centos-icewm-vnc:1.3.0
 
 MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
 ENV REFRESHED_AT 2017-12-18
@@ -60,7 +60,7 @@
 ADD ./sakuli-client/src_java/common/scripts/ $STARTUPDIR
 RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
-USER 1984
+USER 1000
 
 ### Sakuli startup script
 # no parameters:

diff --git a/docker/Dockerfile.sakuli.centos.xfce b/docker/Dockerfile.sakuli.centos.xfce
@@ -1,6 +1,6 @@
 # This Dockerfile is used to build a sakuli image based on CentOS
 
-FROM consol/centos-xfce-vnc:1.2.3
+FROM consol/centos-xfce-vnc:1.3.0
 
 MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
 ENV REFRESHED_AT 2017-12-18
@@ -55,7 +55,7 @@ RUN $INST_SCRIPTS/sakuli.sh
 ADD ./sakuli-client/src/common/scripts $STARTUPDIR
 RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
-USER 1984
+USER 1000
 
 ### Sakuli startup script
 # no parameters:

diff --git a/docker/Dockerfile.sakuli.centos.xfce.java b/docker/Dockerfile.sakuli.centos.xfce.java
@@ -1,6 +1,6 @@
 # This Dockerfile is used to build a sakuli image based on CentOS
 
-FROM consol/centos-xfce-vnc:1.2.3
+FROM consol/centos-xfce-vnc:1.3.0
 
 MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
 ENV REFRESHED_AT 2017-12-18
@@ -60,7 +60,7 @@
 ADD ./sakuli-client/src_java/common/scripts/ $STARTUPDIR
 RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
-USER 1984
+USER 1000
 
 ### Sakuli startup script
 # no parameters:

diff --git a/docker/Dockerfile.sakuli.s2i b/docker/Dockerfile.sakuli.s2i
@@ -12,7 +12,7 @@ RUN chmod 775 /opt/sakuli/s2i/* && \
     chmod -R 775 ${SAKULI_TEST_SUITE} && \
     chgrp -R root ${SAKULI_TEST_SUITE}
 
-USER 1984
+USER 1000
 
 ENTRYPOINT []
 CMD ["/opt/sakuli/s2i/usage"]
diff --git a/docker/Dockerfile.sakuli.ubuntu.icewm b/docker/Dockerfile.sakuli.ubuntu.icewm
@@ -1,6 +1,6 @@
 # This Dockerfile is used to build a sakuli image based on Ubuntu
 
-FROM consol/ubuntu-icewm-vnc:1.2.3
+FROM consol/ubuntu-icewm-vnc:1.3.0
 
 MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
 ENV REFRESHED_AT 2017-12-18
@@ -55,7 +55,7 @@ RUN $INST_SCRIPTS/sakuli.sh
 ADD ./sakuli-client/src/common/scripts $STARTUPDIR
 RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
-USER 1984
+USER 1000
 
 ### Sakuli startup script
 # no parameters:

diff --git a/docker/Dockerfile.sakuli.ubuntu.icewm.java b/docker/Dockerfile.sakuli.ubuntu.icewm.java
@@ -1,6 +1,6 @@
 # This Dockerfile is used to build a sakuli image based on Ubuntu
 
-FROM consol/ubuntu-icewm-vnc:1.2.3
+FROM consol/ubuntu-icewm-vnc:1.3.0
 
 MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
 ENV REFRESHED_AT 2017-12-18
@@ -60,7 +60,7 @@
 ADD ./sakuli-client/src_java/common/scripts/ $STARTUPDIR
 RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
-USER 1984
+USER 1000
 
 ### Sakuli startup script
 # no parameters:

diff --git a/docker/Dockerfile.sakuli.ubuntu.xfce b/docker/Dockerfile.sakuli.ubuntu.xfce
@@ -1,6 +1,6 @@
 # This Dockerfile is used to build a sakuli image based on Ubuntu
 
-FROM consol/ubuntu-xfce-vnc:1.2.3
+FROM consol/ubuntu-xfce-vnc:1.3.0
 
 MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
 ENV REFRESHED_AT 2017-12-18
@@ -55,7 +55,7 @@ RUN $INST_SCRIPTS/sakuli.sh
 ADD ./sakuli-client/src/common/scripts $STARTUPDIR
 RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
-USER 1984
+USER 1000
 
 ### Sakuli startup script
 # no parameters:

diff --git a/docker/Dockerfile.sakuli.ubuntu.xfce.java b/docker/Dockerfile.sakuli.ubuntu.xfce.java
@@ -1,6 +1,6 @@
 # This Dockerfile is used to build a sakuli image based on Ubuntu
 
-FROM consol/ubuntu-xfce-vnc:1.2.3
+FROM consol/ubuntu-xfce-vnc:1.3.0
 
 MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
 ENV REFRESHED_AT 2017-12-18
@@ -60,7 +60,7 @@
 ADD ./sakuli-client/src_java/common/scripts/ $STARTUPDIR
 RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
-USER 1984
+USER 1000
 
 ### Sakuli startup script
 # no parameters:

diff --git a/docs/manual/execution/containerized/docker-images.adoc b/docs/manual/execution/containerized/docker-images.adoc
@@ -208,21 +208,20 @@ Since `1.1.0` the Sakuli image run as non-root user per default, so that mean, i
 ## Custom Dockerfile
 FROM consol/sakuli-centos-xfce:v1.1.0
 
-MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
-ENV REFRESHED_AT 2017-03-17
+ENV REFRESHED_AT 2018-03-27
 ENV TZ=Europe/Berlin
 
 ## Install a PDF viewer
 USER 0
 RUN yum install -y libsane-hpaio http://get.code-industry.net/public/master-pdf-editor-4.0.30_qt5.x86_64.rpm \
     && yum clean all
 ## switch back to default user
-USER 1984
+USER 1000
 ----
 
 ===== Change User of running Sakuli Container
 
-Per default, since version `1.1.0` all container processes will executed with user id `1984`. You can chnage the user id like follow:
+Per default, since version `1.2.0` all container processes will executed with user id `1000`. You can chnage the user id like follow:
 
 .Using root (user id `0`)