diff --git a/install/usr/share/swarmlab.io/sec/sec_bootstrap b/install/usr/share/swarmlab.io/sec/sec_bootstrap index c8b5276..1f9eb2d 100755 --- a/install/usr/share/swarmlab.io/sec/sec_bootstrap +++ b/install/usr/share/swarmlab.io/sec/sec_bootstrap @@ -48,7 +48,10 @@ case $ROLE in ttyd -p 3787 bash & - apache2ctl start + /usr/local/bin/docker-entrypoint.sh apache2* + /usr/local/bin/apache2-foreground + + # apache2ctl start tail -f /dev/null # Start ssh server diff --git a/install/usr/share/swarmlab.io/sec/sec_bootstrapmysql b/install/usr/share/swarmlab.io/sec/sec_bootstrapmysql index fcdf8f2..9f8a6f5 100755 --- a/install/usr/share/swarmlab.io/sec/sec_bootstrapmysql +++ b/install/usr/share/swarmlab.io/sec/sec_bootstrapmysql @@ -70,6 +70,7 @@ case $ROLE in # -i "${USER_HOME}/.ssh/id_rsa" \ # ${USER}@${MPI_MASTER_SERVICE_NAME} \ ttyd -p 3787 bash & + chmod 644 /etc/mysql/mysql.conf.d/mysqld.cnf mysqld --user=root tail -f /dev/null #done diff --git a/install/usr/share/swarmlab.io/sec/swarmlab-sec b/install/usr/share/swarmlab.io/sec/swarmlab-sec index 271f2ca..e1a302a 100755 --- a/install/usr/share/swarmlab.io/sec/swarmlab-sec +++ b/install/usr/share/swarmlab.io/sec/swarmlab-sec @@ -171,7 +171,8 @@ if [ -d "$Wdir/project" ]; then && chown -R \${USER1}:\${USER1} \${SSHDIR} \ && chown -R \${USER1}:\${USER1} \${USER_HOME} - WORKDIR /home/docker/project + #WORKDIR /home/docker/project + WORKDIR /var/www/html COPY .vimrc /home/docker EXPOSE 3787 USER docker @@ -257,7 +258,8 @@ if [ "$Wdir" == "$HOME" ]; then && chown -R \${USER1}:\${USER1} \${USER_HOME} COPY .vimrc /home/docker - WORKDIR /home/docker/project + #WORKDIR /home/docker/project + WORKDIR /var/www/html EXPOSE 3787 USER docker EOF