Clone only specified commit

after-start.sh

@@ -1,15 +1,16 @@
 #!/bin/sh -e
-NETWORK=${NETWORK:-"kazoo"}
+
+NETWORK=${NETWORK:-'kazoo'}
 echo wait for kazoo.$NETWORK to start '(you may check docker logs if impatient)'
 watch -g "docker logs kazoo.$NETWORK | grep 'auto-started kapps'" > /dev/null
 
 cd kazoo
-echo -n "create master account: "
+echo -n 'create master account: '
 ./sup crossbar_maintenance create_account admin kamailio.$NETWORK admin admin
-echo -n "add freeswitch to kazoo: "
+echo -n 'add freeswitch to kazoo: '
 ./sup ecallmgr_maintenance add_fs_node freeswitch@freeswitch.$NETWORK
 
-echo -n "enable console debug: "
+echo -n 'enable console debug: '
 ./sup kazoo_maintenance console_level debug
 
 echo wait fot freeswitch to complete connect
@@ -33,8 +34,8 @@ rm -rf apps
 docker exec -i --user root kazoo.$NETWORK rm -rf apps
 
 echo refresh kamailio dispatcher
-docker exec -i kamailio.$NETWORK kamcmd dispatcher.reload 
+docker exec -i kamailio.$NETWORK kamcmd dispatcher.reload
 
 echo commit couchdb to couchdb-init
 docker commit couchdb.$NETWORK $NETWORK/couchdb-init
-cd ../
+cd ..

base-os/Dockerfile

@@ -1,6 +1,8 @@
 FROM debian:jessie
 MAINTAINER Roman Galeev <jamhed@2600hz.com>
 
+ARG NETWORK
+
 ENV DEBIAN_FRONTEND noninteractive
 ENV APT_LISTCHANGES_FRONTEND=none
 

base-os/build.sh

@@ -1,3 +1,7 @@
 #!/bin/sh -e
-NETWORK=${NETWORK:-"kazoo"}
-docker build $BUILD_FLAGS -t $NETWORK/base-os .
+
+NETWORK=${NETWORK:-'kazoo'}
+
+docker build $BUILD_FLAGS \
+       --build-arg NETWORK=$NETWORK \
+       -t $NETWORK/base-os .

bin/docker-cleanup

@@ -1,4 +1,5 @@
 #!/bin/sh -e
+
 docker rm $(docker ps -a --filter status=dead -q)
 docker rm $(docker ps -a --filter status=exited -q)
 docker rmi $(docker images -a --filter=dangling=true -q)

bin/find-debian-deps.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
-DIR=${1:-"./"}
+
+DIR=${1:-'./'}
 find $DIR | while read file
 do
-        objdump -p $file 2>/dev/null | grep NEEDED
+    objdump -p $file 2>/dev/null | grep NEEDED
 done | while read a b; do echo $b; done | sort | uniq | while read file; do dpkg -S $file 2>/dev/null; done | cut -d: -f 1 | sort | uniq

bin/get-commit

@@ -1,8 +1,9 @@
 #!/bin/sh -e
-if [ "$1" = "" ]
+
+if [ "$1" = '' ]
 then
-	echo Usage: $0 remote-git-uri
-	exit
+    echo Usage: $0 remote-git-uri
+    exit
 fi
 
-git ls-remote $1 | head -1 | sed "s/HEAD//"
+git ls-remote $1 | head -1 | sed 's/HEAD//'

bin/get-ip

@@ -1,9 +1,10 @@
 #!/bin/sh -e
-NETWORK=${NETWORK:-"kazoo"}
-if [ "$1" = "" ]
+
+NETWORK=${NETWORK:-'kazoo'}
+if [ "$1" = '' ]
 then
-	echo Usage: $0 container
-	exit
+    echo Usage: $0 container
+    exit
 fi
 
-docker inspect --format "{{ (index .NetworkSettings.Networks \"$NETWORK\").IPAddress }}" $1
+docker inspect --format '{{ (index .NetworkSettings.Networks "'$NETWORK'").IPAddress }}' $1

bin/uncolor

@@ -1,2 +1,3 @@
 #!/bin/sh -e
-sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"
+
+sed -r 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g'

build.sh

@@ -1,17 +1,35 @@
-#!/bin/bash
+#!/bin/bash -e
+
 INSTALLED=`docker version --format '{{.Server.Version}}'`
 REQUIRED="1.9.0"
-if [ "$(printf "$REQUIRED\n$INSTALLED" | sort -V | head -n1)" == "$INSTALLED" ] && [ "$INSTALLED" != "$REQUIRED" ]
+if [ "$INSTALLED" != "$REQUIRED" ] && [ "$(printf "$REQUIRED\n$INSTALLED" | sort -V | head -n1)" == "$INSTALLED" ]
 then
-	echo Docker version $INSTALLED is probably too old, required version is $REQUIRED
-	exit
+    echo Docker version $INSTALLED is probably too old, required version is $REQUIRED
+    exit
 fi
-cd base-os && ./build.sh
-cd ../kazoo-erlang && ./build.sh
-cd ../rabbitmq && ./build.sh
-cd ../couchdb &&./build.sh
-cd ../kamailio && ./build.sh d62fd3e4976633aa6b827d527f4e15de0b08068b
+
+pushd base-os
+./build.sh
+popd
+pushd kazoo-erlang
+./build.sh
+popd
+pushd rabbitmq
+./build.sh
+popd
+pushd couchdb
+./build.sh
+popd
+pushd kamailio
+./build.sh 4.4.5
+popd
+pushd freeswitch
 # 1.6.13
-cd ../freeswitch && ./build.sh e755b430da70bd63eebf1dfddacdce48ce863fce
-cd ../kazoo && ./build.sh
-cd ../monster-ui && ./build.sh
+./build.sh e755b430da70bd63eebf1dfddacdce48ce863fce
+popd
+pushd kazoo
+./build.sh
+popd
+pushd monster-ui
+./build.sh
+popd

cluster/after-start.sh

@@ -1,4 +1,5 @@
 #!/bin/sh -e
+
 echo Init the system
 
 ./sup crossbar_maintenance create_account admin kamailio.kazoo admin admin
@@ -12,4 +13,4 @@ rm -rf apps
 
 ./sup crossbar_maintenance init_apps /home/user/apps http://kazoo.kazoo:8000/v2
 
-docker exec -ti kamailio.kazoo kamctl dispatcher reload 
+docker exec -ti kamailio.kazoo kamctl dispatcher reload

cluster/run.sh

@@ -1,4 +1,5 @@
 #!/bin/sh -e
+
 docker network create kazoo
 docker network create zone1
 docker network create zone2
@@ -13,11 +14,11 @@ RABBITMQ_IP=$(bin/get-ip rabbitmq.kazoo)
 COUCHDB_IP=$(bin/get-ip couchdb.kazoo)
 
 export NETWORK=zone1
-kazoo/run.sh "-td --add-host rabbitmq.kazoo:$RABBITMQ_IP --add-host couchdb.kazoo:$COUCHDB_IP"
+kazoo/run.sh '-td --add-host rabbitmq.kazoo:'$RABBITMQ_IP' --add-host couchdb.kazoo:'$COUCHDB_IP
 freeswitch/run.sh
 
 export NETWORK=zone2
-kazoo/run.sh "-td --add-host rabbitmq.kazoo:$RABBITMQ_IP --add-host couchdb.kazoo:$COUCHDB_IP"
+kazoo/run.sh '-td --add-host rabbitmq.kazoo:'$RABBITMQ_IP' --add-host couchdb.kazoo:'$COUCHDB_IP
 freeswitch/run.sh
 
 # disable isolation

cluster/stop.sh

@@ -1,4 +1,5 @@
 #!/bin/sh -e
+
 docker stop monster-ui.kazoo
 docker stop kamailio.kazoo
 docker stop couchdb.kazoo
@@ -13,4 +14,3 @@ docker stop kazoo.zone2
 docker network rm kazoo
 docker network rm zone1
 docker network rm zone2
-

cluster/sup

@@ -1,2 +1,3 @@
 #!/bin/sh -e
+
 docker exec -ti kazoo.zone1 sup "$*"

couchdb/build.sh

@@ -1,3 +1,6 @@
 #!/bin/sh -e
-NETWORK=${NETWORK:-"kazoo"}
-docker build $BUILD_FLAGS -t $NETWORK/couchdb2 .
+
+NETWORK=${NETWORK:-'kazoo'}
+
+docker build $BUILD_FLAGS \
+       -t $NETWORK/couchdb2 .

couchdb/run.sh

@@ -1,20 +1,21 @@
 #!/bin/sh -e
-FLAGS=${1:-"-td"}
-IMAGE=${2:-"kazoo/couchdb2"}
-NETWORK=${NETWORK:-"kazoo"}
+
+FLAGS=${1:-'-td'}
+IMAGE=${2:-'kazoo/couchdb2'}
+NETWORK=${NETWORK:-'kazoo'}
 NAME=couchdb.$NETWORK
 
 if [ -n "$(docker ps -aq -f name=$NAME)" ]
 then
-   echo -n "stopping: "
-   docker stop -t 1 $NAME
-   echo -n "removing: "
-   docker rm -f $NAME
+    echo -n 'stopping: '
+    docker stop -t 1 $NAME
+    echo -n 'removing: '
+    docker rm -f $NAME
 fi
 echo -n "starting: $NAME "
 
 docker run $FLAGS \
-	--net $NETWORK \
-	-h $NAME \
-	--name $NAME \
-	$IMAGE
+       --net $NETWORK \
+       -h $NAME \
+       --name $NAME \
+       $IMAGE

couchdb1.6/build.sh

@@ -1,3 +1,6 @@
 #!/bin/sh -e
-NETWORK=${NETWORK:-"kazoo"}
-docker build $BUILD_FLAGS -t $NETWORK/couchdb .
+
+NETWORK=${NETWORK:-'kazoo'}
+
+docker build $BUILD_FLAGS \
+       -t $NETWORK/couchdb .

couchdb1.6/run.sh

@@ -1,20 +1,21 @@
 #!/bin/sh -e
-FLAGS=${1:-"-td"}
-IMAGE=${2:-"kazoo/couchdb"}
-NETWORK=${NETWORK:-"kazoo"}
+
+FLAGS=${1:-'-td'}
+IMAGE=${2:-'kazoo/couchdb'}
+NETWORK=${NETWORK:-'kazoo'}
 NAME=couchdb.$NETWORK
 
 if [ -n "$(docker ps -aq -f name=$NAME)" ]
 then
-   echo -n "stopping: "
-   docker stop -t 1 $NAME
-   echo -n "removing: "
-   docker rm -f $NAME
+    echo -n 'stopping: '
+    docker stop -t 1 $NAME
+    echo -n 'removing: '
+    docker rm -f $NAME
 fi
 echo -n "starting: $NAME "
 
 docker run $FLAGS \
-	--net $NETWORK \
-	-h $NAME \
-	--name $NAME \
-	$IMAGE
+       --net $NETWORK \
+       -h $NAME \
+       --name $NAME \
+       $IMAGE

export/all.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
-export NETWORK=${NETWORK:-"kazoo"}
-docker rmi -f $(docker images | grep "2600hz/" | cut -d' ' -f 1)
+
+export NETWORK=${NETWORK:-'kazoo'}
+docker rmi -f $(docker images | grep '2600hz/' | cut -d' ' -f 1)
 cd ~/kazoo-docker/export/couchdb && ./build.sh
 cd ../rabbitmq && ./build.sh
 cd ../kazoo && ./extract.sh kazoo.$NETWORK && ./build.sh

export/rabbitmq/run.sh

@@ -1,17 +1,19 @@
 #!/bin/sh -e
-FLAGS=${1:-"-td"}
-NETWORK=${NETWORK:-"kazoo"} 
+
+FLAGS=${1:-'-td'}
+NETWORK=${NETWORK:-'kazoo'}
 NAME=rabbitmq.$NETWORK
 if [ -n "$(docker ps -aq -f name=$NAME)" ]
 then
-   echo -n "stopping: "
-   docker stop -t 1 $NAME
-   echo -n "removing: "
-   docker rm -f $NAME
+    echo -n 'stopping: '
+    docker stop -t 1 $NAME
+    echo -n 'removing: '
+    docker rm -f $NAME
 fi
+
 echo -n "starting: $NAME "
 docker run $FLAGS \
-	--net $NETWORK \
-	-h $NAME \
-	--name $NAME \
-	2600hz/rabbitmq
+       --net $NETWORK \
+       -h $NAME \
+       --name $NAME \
+       2600hz/rabbitmq

freeswitch/Dockerfile

@@ -3,7 +3,9 @@ MAINTAINER Roman Galeev <jamhed@2600hz.com>
 
 USER root
 
-ARG REPO=https://freeswitch.org/stash/scm/fs/freeswitch.git
+ARG NETWORK
+ARG REPO
+ARG FREESWITCH_COMMIT
 ARG CONFIG=master
 
 COPY build/setup-os.sh build/setup-os.sh
@@ -12,10 +14,6 @@ RUN build/setup-os.sh
 COPY build/setup.sh build/setup.sh
 RUN build/setup.sh
 
-COPY etc/commit commit
-COPY build/setup-commit.sh build/setup-commit.sh
-RUN build/setup-commit.sh
-
 COPY etc/modules.conf freeswitch/modules.conf
 COPY build/configure.sh build/configure.sh
 RUN build/configure.sh

freeswitch/build.sh

@@ -1,8 +1,11 @@
 #!/bin/sh -e
-NETWORK=${NETWORK:-"kazoo"}
-REPO=${2:-"https://freeswitch.org/stash/scm/fs/freeswitch.git"}
-COMMIT=${1:-"$(../bin/get-commit $REPO)"}
 
-echo $COMMIT > etc/commit
+NETWORK=${NETWORK:-'kazoo'}
+REPO=${2:-'https://freeswitch.org/stash/scm/fs/freeswitch.git'}
+COMMIT=${1:-"$(../bin/get-commit $REPO)"}
 
-docker build $BUILD_FLAGS --build-arg REPO=$REPO -t $NETWORK/freeswitch .
+docker build $BUILD_FLAGS \
+       --build-arg NETWORK=$NETWORK \
+       --build-arg REPO=$REPO \
+       --build-arg FREESWITCH_COMMIT=$COMMIT \
+       -t $NETWORK/freeswitch .

freeswitch/build/build.sh

@@ -1,3 +1,3 @@
 #!/bin/sh -e
-cd freeswitch
-make
+
+cd freeswitch && make

freeswitch/build/setup-config.sh

@@ -1,6 +1,3 @@
 #!/bin/sh -e
-CONFIG=${CONFIG:-"master"}
-git clone https://github.com/2600hz/kazoo-configs.git kazoo-configs
-cd kazoo-configs
-git reset --hard $CONFIG
-cd ../
+
+git clone --depth 1 --branch="$CONFIG" https://github.com/2600hz/kazoo-configs.git kazoo-configs

freeswitch/build/setup-os.sh

@@ -1,4 +1,5 @@
 #!/bin/sh -e
+
 apt-get install -y --force-yes freeswitch-video-deps-most \
 	ladspa-sdk tap-plugins swh-plugins libgsm1 libfftw3-3 autotalent \
 	librabbitmq-dev

freeswitch/build/setup.sh

@@ -1,2 +1,3 @@
 #!/bin/sh -e
-git clone $REPO freeswitch
+
+git clone --depth 1 $REPO --branch=$FREESWITCH_COMMIT freeswitch