Polish the docker-compose setup.
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp b/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
index 919cf0f..88ca6f8 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
@@ -67,7 +67,8 @@
<s:select name="bean.theme" size="1" list="themes" listKey="id" listValue="name"
onchange="previewImage(this[selectedIndex].value)"/>
<p id="themedescription"></p>
- <img id="themeThumbnail" src='' />
+ <p><img id="themeThumbnail" src="" class="img-responsive img-thumbnail" style="max-width: 30em" /></p>
+
</div>
</div>
diff --git a/assembly-release/copy-files.sh b/assembly-release/copy-files.sh
new file mode 100644
index 0000000..b84e15a
--- /dev/null
+++ b/assembly-release/copy-files.sh
@@ -0,0 +1 @@
+cp target/roller-release
diff --git a/assembly-release/copy-to-asf.sh b/assembly-release/copy-to-asf.sh
new file mode 100755
index 0000000..b083fdb
--- /dev/null
+++ b/assembly-release/copy-to-asf.sh
@@ -0,0 +1,2 @@
+cp target/roller-release-* ~/src.asf/roller-dist/dev/roller/roller-6.0/v6.0.0
+
diff --git a/deployment/docker-compose/Dockerfile b/deployment/docker-compose/Dockerfile
index 2dbbda6..4a61b31 100644
--- a/deployment/docker-compose/Dockerfile
+++ b/deployment/docker-compose/Dockerfile
@@ -50,6 +50,7 @@
# start Tomcat
ADD entry-point.sh /usr/local/tomcat/bin
+ADD wait-for-it.sh /usr/local/tomcat/bin
RUN chgrp -R 0 /usr/local/tomcat
RUN chmod -R g+rw /usr/local/tomcat
diff --git a/deployment/docker-compose/build.sh b/deployment/docker-compose/build.sh
index 9b1b08c..2a3ed8d 100755
--- a/deployment/docker-compose/build.sh
+++ b/deployment/docker-compose/build.sh
@@ -17,8 +17,8 @@
# directory of this distribution.
-TAG=roller:6.0.0-SNAPSHOT-1
+TAG=roller:6.0.0-SNAPSHOT
-docker build . -t snoopdave/${TAG}
+docker build --no-cache . -t snoopdave/${TAG}
docker push snoopdave/${TAG}
diff --git a/deployment/docker-compose/docker-compose.yml b/deployment/docker-compose/docker-compose.yml
index 59a37d4..04efca0 100644
--- a/deployment/docker-compose/docker-compose.yml
+++ b/deployment/docker-compose/docker-compose.yml
@@ -25,7 +25,7 @@
- "5432:5432"
volumes:
- type: bind
- source: /Users/dave/src/apache-roller/deployment/docker-compose/postgresql-data
+ source: ./postgresql-data
target: /var/lib/postgresql/data
environment:
- POSTGRES_DB=rollerdb
@@ -33,11 +33,11 @@
- POSTGRES_PASSWORD=tiger
roller:
- image: "snoopdave/roller:6.0.0-SNAPSHOT-1"
+ image: "snoopdave/roller:6.0.0-SNAPSHOT"
ports:
- "8080:8080"
volumes:
- type: bind
- source: /Users/dave/src/apache-roller/deployment/docker-compose/roller-data
+ source: ./roller-data
target: /var/lib/roller/data
diff --git a/deployment/docker-compose/entry-point.sh b/deployment/docker-compose/entry-point.sh
index e8a51bf..c9f538d 100755
--- a/deployment/docker-compose/entry-point.sh
+++ b/deployment/docker-compose/entry-point.sh
@@ -16,7 +16,6 @@
# copyright in this work, please see the NOTICE file in the top level
# directory of this distribution.
-
cat > /usr/local/tomcat/lib/roller-custom.properties << EOF
installation.type=auto
mediafiles.storage.dir=${STORAGE_ROOT}/roller_mediafiles
@@ -29,6 +28,7 @@
database.jdbc.password=${DATABASE_JDBC_PASSWORD}
EOF
+/usr/local/tomcat/bin/wait-for-it.sh postgresql:5434
/usr/local/tomcat/bin/catalina.sh run
diff --git a/deployment/docker-compose/wait-for-it.sh b/deployment/docker-compose/wait-for-it.sh
new file mode 100755
index 0000000..071c2be
--- /dev/null
+++ b/deployment/docker-compose/wait-for-it.sh
@@ -0,0 +1,178 @@
+#!/usr/bin/env bash
+# Use this script to test if a given TCP host/port are available
+
+WAITFORIT_cmdname=${0##*/}
+
+echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
+
+usage()
+{
+ cat << USAGE >&2
+Usage:
+ $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
+ -h HOST | --host=HOST Host or IP under test
+ -p PORT | --port=PORT TCP port under test
+ Alternatively, you specify the host and port as host:port
+ -s | --strict Only execute subcommand if the test succeeds
+ -q | --quiet Don't output any status messages
+ -t TIMEOUT | --timeout=TIMEOUT
+ Timeout in seconds, zero for no timeout
+ -- COMMAND ARGS Execute command with args after the test finishes
+USAGE
+ exit 1
+}
+
+wait_for()
+{
+ if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+ echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+ else
+ echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
+ fi
+ WAITFORIT_start_ts=$(date +%s)
+ while :
+ do
+ if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
+ nc -z $WAITFORIT_HOST $WAITFORIT_PORT
+ WAITFORIT_result=$?
+ else
+ (echo > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
+ WAITFORIT_result=$?
+ fi
+ if [[ $WAITFORIT_result -eq 0 ]]; then
+ WAITFORIT_end_ts=$(date +%s)
+ echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
+ break
+ fi
+ sleep 1
+ done
+ return $WAITFORIT_result
+}
+
+wait_for_wrapper()
+{
+ # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
+ if [[ $WAITFORIT_QUIET -eq 1 ]]; then
+ timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+ else
+ timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+ fi
+ WAITFORIT_PID=$!
+ trap "kill -INT -$WAITFORIT_PID" INT
+ wait $WAITFORIT_PID
+ WAITFORIT_RESULT=$?
+ if [[ $WAITFORIT_RESULT -ne 0 ]]; then
+ echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+ fi
+ return $WAITFORIT_RESULT
+}
+
+# process arguments
+while [[ $# -gt 0 ]]
+do
+ case "$1" in
+ *:* )
+ WAITFORIT_hostport=(${1//:/ })
+ WAITFORIT_HOST=${WAITFORIT_hostport[0]}
+ WAITFORIT_PORT=${WAITFORIT_hostport[1]}
+ shift 1
+ ;;
+ --child)
+ WAITFORIT_CHILD=1
+ shift 1
+ ;;
+ -q | --quiet)
+ WAITFORIT_QUIET=1
+ shift 1
+ ;;
+ -s | --strict)
+ WAITFORIT_STRICT=1
+ shift 1
+ ;;
+ -h)
+ WAITFORIT_HOST="$2"
+ if [[ $WAITFORIT_HOST == "" ]]; then break; fi
+ shift 2
+ ;;
+ --host=*)
+ WAITFORIT_HOST="${1#*=}"
+ shift 1
+ ;;
+ -p)
+ WAITFORIT_PORT="$2"
+ if [[ $WAITFORIT_PORT == "" ]]; then break; fi
+ shift 2
+ ;;
+ --port=*)
+ WAITFORIT_PORT="${1#*=}"
+ shift 1
+ ;;
+ -t)
+ WAITFORIT_TIMEOUT="$2"
+ if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
+ shift 2
+ ;;
+ --timeout=*)
+ WAITFORIT_TIMEOUT="${1#*=}"
+ shift 1
+ ;;
+ --)
+ shift
+ WAITFORIT_CLI=("$@")
+ break
+ ;;
+ --help)
+ usage
+ ;;
+ *)
+ echoerr "Unknown argument: $1"
+ usage
+ ;;
+ esac
+done
+
+if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
+ echoerr "Error: you need to provide a host and port to test."
+ usage
+fi
+
+WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
+WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
+WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
+WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
+
+# check to see if timeout is from busybox?
+WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
+WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
+if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
+ WAITFORIT_ISBUSY=1
+ WAITFORIT_BUSYTIMEFLAG="-t"
+
+else
+ WAITFORIT_ISBUSY=0
+ WAITFORIT_BUSYTIMEFLAG=""
+fi
+
+if [[ $WAITFORIT_CHILD -gt 0 ]]; then
+ wait_for
+ WAITFORIT_RESULT=$?
+ exit $WAITFORIT_RESULT
+else
+ if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+ wait_for_wrapper
+ WAITFORIT_RESULT=$?
+ else
+ wait_for
+ WAITFORIT_RESULT=$?
+ fi
+fi
+
+if [[ $WAITFORIT_CLI != "" ]]; then
+ if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
+ echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
+ exit $WAITFORIT_RESULT
+ fi
+ exec "${WAITFORIT_CLI[@]}"
+else
+ exit $WAITFORIT_RESULT
+fi
