From 89df82f09593994e7e69767eb63b940d5fa01fe1 Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Mon, 12 Sep 2016 16:42:17 -0400 Subject: [PATCH] More testing --- bin/compose.sh | 4 ++++ bin/decompose.sh | 4 ++++ bin/prune.sh | 7 +++++++ bin/recompose.sh | 3 +++ common.bash | 4 ++-- docker-compose.yml | 34 ++++++++++++++++++++++++++++++++++ 6 files changed, 54 insertions(+), 2 deletions(-) create mode 100755 bin/compose.sh create mode 100755 bin/decompose.sh create mode 100755 bin/prune.sh create mode 100755 bin/recompose.sh create mode 100644 docker-compose.yml diff --git a/bin/compose.sh b/bin/compose.sh new file mode 100755 index 0000000..edb2141 --- /dev/null +++ b/bin/compose.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +echo "Composing" +docker-compose up -d \ No newline at end of file diff --git a/bin/decompose.sh b/bin/decompose.sh new file mode 100755 index 0000000..754e6a4 --- /dev/null +++ b/bin/decompose.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +echo "Decomposing" +docker-compose stop \ No newline at end of file diff --git a/bin/prune.sh b/bin/prune.sh new file mode 100755 index 0000000..2efa97c --- /dev/null +++ b/bin/prune.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +result=$(docker volume ls -qf dangling=true) + +if [ ! -z "$result" ]; then + docker volume rm $result +fi diff --git a/bin/recompose.sh b/bin/recompose.sh new file mode 100755 index 0000000..6749985 --- /dev/null +++ b/bin/recompose.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +source bin/decompose.sh && source bin/destroy.sh && source bin/prune.sh && source bin/build.sh && source bin/compose.sh \ No newline at end of file diff --git a/common.bash b/common.bash index cd630af..498e7c4 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,3 @@ -maintainer="bigfleet" -imagename="shibboleth_idp_runtime" +maintainer="my" +imagename="shibboleth_idp" version="3.2.1" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..3fc2da5 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,34 @@ +version: '2' + +services: + shibboleth_idp_0: + image: my/shibboleth_idp + container_name: shibboleth_idp_0 + hostname: shibboleth_idp_0 + volumes: + - ./credentials:/tmp/credentials + - ./logs/tomcat:/usr/local/tomcat/logs:rw + - ./logs/shibboleth_idp:/opt/shibboleth/shibboleth-identity-provider-3.2.1/logs:rw + ports: + - "8080:8443" + shibboleth_idp_1: + image: my/shibboleth_idp + container_name: shibboleth_idp_1 + hostname: shibboleth_idp_1 + volumes: + - ./credentials:/tmp/credentials + - ./logs/tomcat:/usr/local/tomcat/logs:rw + - ./logs/shibboleth_idp:/opt/shibboleth/shibboleth-identity-provider-3.2.1/logs:rw + ports: + - "8081:8443" + haproxy: + image: my/haproxy + container_name: haproxy + hostname: haproxy + links: + - shibboleth_idp_1 + - shibboleth_idp_0 + ports: + - "80:80" + - "5533:5533" + - "443:443" \ No newline at end of file