optimize docker image layers for sakuli and sakuli-java image #253

ConSol · Mar 5, 2018 · 66ca190 · 66ca190
1 parent 975585c
commit 66ca190
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/docker/Dockerfile.sakuli.centos.icewm b/docker/Dockerfile.sakuli.centos.icewm
@@ -53,7 +53,7 @@ RUN $INST_SCRIPTS/sakuli.sh
 
 ### configure startup
 ADD ./sakuli-client/src/common/scripts $STARTUPDIR
-RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR $HOME
+RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
 USER 1984
 

diff --git a/docker/Dockerfile.sakuli.centos.icewm.java b/docker/Dockerfile.sakuli.centos.icewm.java
@@ -58,7 +58,7 @@
 ### configure startup
 ADD ./sakuli-client/src/common/scripts/ $STARTUPDIR
 ADD ./sakuli-client/src_java/common/scripts/ $STARTUPDIR
-RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR $HOME $SAKULI_TEST_SUITE
+RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
 USER 1984
 

diff --git a/docker/Dockerfile.sakuli.centos.xfce b/docker/Dockerfile.sakuli.centos.xfce
@@ -53,7 +53,7 @@ RUN $INST_SCRIPTS/sakuli.sh
 
 ### configure startup
 ADD ./sakuli-client/src/common/scripts $STARTUPDIR
-RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR $HOME
+RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
 USER 1984
 

diff --git a/docker/Dockerfile.sakuli.centos.xfce.java b/docker/Dockerfile.sakuli.centos.xfce.java
@@ -58,7 +58,7 @@
 ### configure startup
 ADD ./sakuli-client/src/common/scripts/ $STARTUPDIR
 ADD ./sakuli-client/src_java/common/scripts/ $STARTUPDIR
-RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR $HOME $SAKULI_TEST_SUITE
+RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
 USER 1984
 

diff --git a/docker/Dockerfile.sakuli.ubuntu.icewm b/docker/Dockerfile.sakuli.ubuntu.icewm
@@ -53,7 +53,7 @@ RUN $INST_SCRIPTS/sakuli.sh
 
 ### configure startup
 ADD ./sakuli-client/src/common/scripts $STARTUPDIR
-RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR $HOME
+RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
 USER 1984
 

diff --git a/docker/Dockerfile.sakuli.ubuntu.icewm.java b/docker/Dockerfile.sakuli.ubuntu.icewm.java
@@ -58,7 +58,7 @@
 ### configure startup
 ADD ./sakuli-client/src/common/scripts/ $STARTUPDIR
 ADD ./sakuli-client/src_java/common/scripts/ $STARTUPDIR
-RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR $HOME $SAKULI_TEST_SUITE
+RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
 USER 1984
 

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:dev
 
 MAINTAINER Tobias Schneck "[email protected]"
 ENV REFRESHED_AT 2017-12-18
@@ -53,7 +53,7 @@ RUN $INST_SCRIPTS/sakuli.sh
 
 ### configure startup
 ADD ./sakuli-client/src/common/scripts $STARTUPDIR
-RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR $HOME
+RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
 USER 1984
 

diff --git a/docker/Dockerfile.sakuli.ubuntu.xfce.java b/docker/Dockerfile.sakuli.ubuntu.xfce.java
@@ -58,7 +58,7 @@
 ### configure startup
 ADD ./sakuli-client/src/common/scripts/ $STARTUPDIR
 ADD ./sakuli-client/src_java/common/scripts/ $STARTUPDIR
-RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR $HOME $SAKULI_TEST_SUITE
+RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR
 # use headless user for startup
 USER 1984
 

diff --git a/docker/sakuli-client/src_java/common/install/sakuli.sh b/docker/sakuli-client/src_java/common/install/sakuli.sh
@@ -24,4 +24,4 @@ echo "export MAVEN_OPTS=-Dsakuli.version=$SAKULI_VERSION" >> $HOME/.bashrc
 echo 'echo MAVEN_OPTS=$MAVEN_OPTS' >> $HOME/.bashrc
 
 echo "set correct permissions"
-$INST_SCRIPTS/set_user_permission.sh $SAKULI_TEST_SUITE
+$INST_SCRIPTS/set_user_permission.sh $HOME $SAKULI_TEST_SUITE