zeus 3 years ago
parent
commit
036deb788a
  1. 1
      install/usr/share/swarmlab.io/sec/custom/custom.sh
  2. 0
      install/usr/share/swarmlab.io/sec/custom/extrapackages
  3. 15
      install/usr/share/swarmlab.io/sec/custom/setup.sh
  4. 7
      install/usr/share/swarmlab.io/sec/swarmlab-sec

1
install/usr/share/swarmlab.io/sec/custom/custom.sh

@ -0,0 +1 @@
#!/bin/sh

0
install/usr/share/swarmlab.io/sec/custom/extrapackages

15
install/usr/share/swarmlab.io/sec/custom/setup.sh

@ -0,0 +1,15 @@
#!/bin/sh
echo "==> extra packages"
extrap=/tmp/bin/extrapackages
if [ -f $extrap ]; then
sh $extrap
fi
echo "==> exec custom"
extrashell=/tmp/bin/custom.sh
if [ -f $extrashell ]; then
sh $extrashell
fi

7
install/usr/share/swarmlab.io/sec/swarmlab-sec

@ -154,6 +154,9 @@ if [ -d "$Wdir/project" ]; then
&& chmod -R 600 \${SSHDIR}/* \ && chmod -R 600 \${SSHDIR}/* \
&& chown -R \${USER1}:\${USER1} \${SSHDIR} && chown -R \${USER1}:\${USER1} \${SSHDIR}
COPY custom /tmp/bin
RUN /tmp/bin/setup.sh
WORKDIR /home/docker/project WORKDIR /home/docker/project
COPY .vimrc /home/docker COPY .vimrc /home/docker
EXPOSE 3787 EXPOSE 3787
@ -237,6 +240,9 @@ if [ "$Wdir" == "$HOME" ]; then
&& chmod -R 600 \${SSHDIR}/* \ && chmod -R 600 \${SSHDIR}/* \
&& chown -R \${USER1}:\${USER1} \${SSHDIR} && chown -R \${USER1}:\${USER1} \${SSHDIR}
COPY custom /tmp/bin
RUN /tmp/bin/setup.sh
COPY .vimrc /home/docker COPY .vimrc /home/docker
WORKDIR /home/docker/project WORKDIR /home/docker/project
EXPOSE 3787 EXPOSE 3787
@ -256,6 +262,7 @@ fi
/bin/cp -rf $DIR/.vimrc $Wdir/.vimrc /bin/cp -rf $DIR/.vimrc $Wdir/.vimrc
/bin/cp -rf $DIR/bin $Wdir /bin/cp -rf $DIR/bin $Wdir
/bin/cp -rf $DIR/install-vim-plugin.sh $Wdir/install-vim-plugin.sh /bin/cp -rf $DIR/install-vim-plugin.sh $Wdir/install-vim-plugin.sh
/bin/cp -rf $DIR/custom $Wdir
cat << EOF > $Wdir/docker-compose.yml cat << EOF > $Wdir/docker-compose.yml

Loading…
Cancel
Save