From c05685dd1c451a361a8242baec8d327fa9ff3a3f Mon Sep 17 00:00:00 2001 From: zeus Date: Tue, 4 Jan 2022 16:07:03 +0200 Subject: [PATCH] add --- .../usr/share/swarmlab.io/sec/custom/custom.sh | 1 + .../share/swarmlab.io/sec/custom/extrapackages | 0 install/usr/share/swarmlab.io/sec/custom/setup.sh | 15 +++++++++++++++ install/usr/share/swarmlab.io/sec/swarmlab-sec | 15 +++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 install/usr/share/swarmlab.io/sec/custom/custom.sh create mode 100644 install/usr/share/swarmlab.io/sec/custom/extrapackages create mode 100755 install/usr/share/swarmlab.io/sec/custom/setup.sh diff --git a/install/usr/share/swarmlab.io/sec/custom/custom.sh b/install/usr/share/swarmlab.io/sec/custom/custom.sh new file mode 100644 index 0000000..1a24852 --- /dev/null +++ b/install/usr/share/swarmlab.io/sec/custom/custom.sh @@ -0,0 +1 @@ +#!/bin/sh diff --git a/install/usr/share/swarmlab.io/sec/custom/extrapackages b/install/usr/share/swarmlab.io/sec/custom/extrapackages new file mode 100644 index 0000000..e69de29 diff --git a/install/usr/share/swarmlab.io/sec/custom/setup.sh b/install/usr/share/swarmlab.io/sec/custom/setup.sh new file mode 100755 index 0000000..0577c93 --- /dev/null +++ b/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 diff --git a/install/usr/share/swarmlab.io/sec/swarmlab-sec b/install/usr/share/swarmlab.io/sec/swarmlab-sec index c4533a0..8eaed28 100755 --- a/install/usr/share/swarmlab.io/sec/swarmlab-sec +++ b/install/usr/share/swarmlab.io/sec/swarmlab-sec @@ -173,6 +173,13 @@ if [ -d "$Wdir/project" ]; then && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y ssl-cert \ && a2enmod ssl + + + COPY custom /tmp/bin + RUN /tmp/bin/setup.sh + + + WORKDIR /var/www/html/ COPY .vimrc /home/docker EXPOSE 3787 @@ -262,6 +269,13 @@ if [ "$Wdir" == "$HOME" ]; then && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y ssl-cert \ && a2enmod ssl + + + COPY custom /tmp/bin + RUN /tmp/bin/setup.sh + + + COPY .vimrc /home/docker WORKDIR /var/www/html/ EXPOSE 3787 @@ -285,6 +299,7 @@ fi /bin/cp -rf $DIR/.vimrc $Wdir/.vimrc /bin/cp -rf $DIR/bin $Wdir /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