Add compose switch

Author: dcflachs

build_in_docker.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 [ -z "$COMPOSE_VERSION" ] && COMPOSE_VERSION=2.0.1
-docker run --rm --tmpfs /tmp -v $PWD/archive:/mnt/output:rw -e COMPOSE_VERSION=$COMPOSE_VERSION -e OUTPUT_FOLDER="/mnt/output" -v $PWD/source:/mnt/source:ro vbatts/slackware:latest /mnt/source/pkg_build.sh $UI_VERSION_LETTER
+[ -z "COMPOSE_SWITCH_VERSION" ] && COMPOSE_SWITCH_VERSION=1.0.2
+docker run --rm --tmpfs /tmp -v $PWD/archive:/mnt/output:rw -e COMPOSE_VERSION=$COMPOSE_VERSION -e COMPOSE_SWITCH_VERSION=$COMPOSE_SWITCH_VERSION -e OUTPUT_FOLDER="/mnt/output" -v $PWD/source:/mnt/source:ro vbatts/slackware:latest /mnt/source/pkg_build.sh $UI_VERSION_LETTER

compose.manager.plg

@@ -43,7 +43,7 @@ rm -f $(ls &pluginLOC;/&name;*.txz 2>/dev/null|grep -v '&packageVER;')
 
 <FILE Run="/bin/bash">
 <INLINE>
-kill -SIGHUP pidof docker
+pidof dockerd | xargs kill -SIGHUP
 </INLINE>
 </FILE>
 

source/pkg_build.sh

@@ -1,24 +1,35 @@
 #!/bin/bash
 [ -z "$OUTPUT_FOLDER" ] && echo "Output Folder not set" && exit 1
 [ -z "$COMPOSE_VERSION" ] && echo "Compose Version not set" && exit 1
+[ -z "$COMPOSE_SWITCH_VERSION" ] && echo "Compose Switch Version not set" && exit 1
 tmpdir=/tmp/tmp.$(( $RANDOM * 19318203981230 + 40 ))
 version=$(date +"%Y.%m.%d")$1
 
 # mkdir -p $tmpdir/usr/local/emhttp/plugins/compose.manager
 
 # cp -RT /mnt/source/docker.compose/ $tmpdir/usr/local/emhttp/plugins/compose.manager/
 
-mkdir -p $tmpdir/usr/local/lib/docker/cli-plugins/
-cd $tmpdir/usr/local/lib/docker/cli-plugins/
+cd $tmpdir
+
+#Install the docker compose cli plugin
 wget --no-check-certificate https://github.com/docker/compose/releases/download/v${COMPOSE_VERSION}/docker-compose-linux-x86_64
 wget --no-check-certificate https://github.com/docker/compose/releases/download/v${COMPOSE_VERSION}/docker-compose-linux-x86_64.sha256
 sha256sum -c docker-compose-linux-x86_64.sha256 2>&1 | grep -q OK || exit 2
 rm docker-compose-linux-x86_64.sha256
 
-cd $tmpdir
-
+mkdir -p $tmpdir/usr/local/lib/docker/cli-plugins/
+cd $tmpdir/usr/local/lib/docker/cli-plugins/
+cp docker-compose-linux-x86_64 docker-compose
 chmod -R +x $tmpdir/usr/local/lib/docker/cli-plugins/
 
+rm docker-compose-linux-x86_64
+
+#Install compose switch
+wget --no-check-certificate  https://github.com/docker/compose-switch/releases/download/v${COMPOSE_SWITCH_VERSION}/docker-compose-linux-amd64 
+cp docker-compose-linux-amd64 /usr/local/bin/docker-compose
+chmod +x /usr/local/bin/docker-compose
+rm docker-compose-linux-amd64
+
 makepkg -l y -c y $OUTPUT_FOLDER/compose.manager-package-${version}.txz
 
 cd /