DOCKER-35

.gitignore

@@ -1,3 +1,4 @@
+.idea
 downloads
 logs-*
 temp-*

.releng/docker-image.changelog

@@ -144,3 +144,52 @@ docker.image.git.id-1.5.9=80b50a4a080850c3e4226567586af820cbf2d447
 
 docker.image.change.log-1.6.0=DOCKER-19
 docker.image.git.id-1.6.0=297f8a5dba6721305f8fa650d1ebe39ec31463fa
+
+#
+# Liferay Docker Image Version 1.6.1
+#
+
+docker.image.change.log-1.6.1=DOCKER-20
+docker.image.git.id-1.6.1=ab5242dd32e07084d6e4e31b7712e704651d94f7
+
+#
+# Liferay Docker Image Version 1.6.2
+#
+
+docker.image.change.log-1.6.2=DOCKER-22
+docker.image.git.id-1.6.2=ea0ef673c7dc7a71fe07c44cce8740d57dac650d
+
+#
+# Liferay Docker Image Version 1.6.3
+#
+
+docker.image.change.log-1.6.3=DOCKER-3
+docker.image.git.id-1.6.3=2f491fb8cbbbd2e3e728cd0bedc878acae3f959a
+
+#
+# Liferay Docker Image Version 1.6.4
+#
+
+docker.image.change.log-1.6.4=DOCKER-8 DOCKER-24 DOCKER-15
+docker.image.git.id-1.6.4=1d0922dc5200859dc1f46964cb38ce3f0dce7e23
+
+#
+# Liferay Docker Image Version 1.6.5
+#
+
+docker.image.change.log-1.6.5=DOCKER-23 DOCKER-24
+docker.image.git.id-1.6.5=8f0bf37ec5507f41f02161402661d528b1c8ecab
+
+#
+# Liferay Docker Image Version 1.6.6
+#
+
+docker.image.change.log-1.6.6=DOCKER-5
+docker.image.git.id-1.6.6=6dc21beaa20fc8ef6760f3aa1ee853f2780d7642
+
+#
+# Liferay Docker Image Version 1.6.7
+#
+
+docker.image.change.log-1.6.7=DOCKER-27
+docker.image.git.id-1.6.7=d7bffb7bf33ce51ff170cf4cf027350c07ea65db

.shellcheckrc

@@ -0,0 +1,13 @@
+#
+# For example, go to https://github.com/koalaman/shellcheck/wiki/SC2236 for more
+# information about SC2236.
+#
+
+disable=SC1090
+disable=SC1091
+disable=SC2034
+disable=SC2046
+disable=SC2143
+disable=SC2155
+disable=SC2181
+disable=SC2236

_common.sh

@@ -8,16 +8,16 @@ function check_utils {
 
 	for util in "${@}"
 	do
-		command -v ${util} >/dev/null 2>&1 || { echo >&2 "The utility ${util} is not installed."; exit 1; }
+		command -v "${util}" >/dev/null 2>&1 || { echo >&2 "The utility ${util} is not installed."; exit 1; }
 	done
 }
 
 function clean_up_temp_directory {
-	rm -fr ${TEMP_DIR}
+	rm -fr "${TEMP_DIR}"
 }
 
 function configure_tomcat {
-	printf "\nCATALINA_OPTS=\"\${CATALINA_OPTS} \${LIFERAY_JVM_OPTS}\"" >> ${TEMP_DIR}/liferay/tomcat/bin/setenv.sh
+	printf "\nCATALINA_OPTS=\"\${CATALINA_OPTS} \${LIFERAY_JVM_OPTS}\"" >> "${TEMP_DIR}/liferay/tomcat/bin/setenv.sh"
 }
 
 function date {
@@ -28,59 +28,59 @@ function date {
 	then
 		if [ "$(uname)" == "Darwin" ]
 		then
-			echo $(/bin/date)
+			/bin/date
 		elif [ -e /bin/date ]
 		then
-			echo $(/bin/date)
+			/bin/date --iso-8601=seconds
 		else
-			echo $(/usr/bin/date)
+			/usr/bin/date --iso-8601=seconds
 		fi
 	else
 		if [ "$(uname)" == "Darwin" ]
 		then
-			echo $(/bin/date -jf "%a %b %e %H:%M:%S %Z %Y" "${1}" "${2}")
+			/bin/date -juf "%a %b %e %T %Z %Y" "${1}" "${2}"
 		elif [ -e /bin/date ]
 		then
-			echo $(/bin/date -d "${1}" "${2}")
+			/bin/date -d "${1}" "${2}"
 		else
-			echo $(/usr/bin/date -d "${1}" "${2}")
+			/usr/bin/date -d "${1}" "${2}"
 		fi
 	fi
 }
 
 function download {
-	local file_name=${1}
-	local file_url=${2}
+	local file_name="${1}"
+	local file_url="${2}"
 
-	if [ -e ${file_name} ] && [[ ${file_url} != */nightly/* ]] && [[ ${file_url} != */latest/* ]]
+	if [ -e "${file_name}" ] && [[ "${file_url}" != */nightly/* ]] && [[ "${file_url}" != */latest/* ]]
 	then
 		return
 	fi
 
-	if [[ ${file_url} != http*://* ]]
+	if [[ "${file_url}" != http*://* ]]
 	then
-		file_url=http://${file_url}
+		file_url="http://${file_url}"
 	fi
 
-	if [[ ${file_url} != http://mirrors.*.liferay.com* ]] &&
-	   [[ ${file_url} != http://release-1* ]] &&
-	   [[ ${file_url} != https://release.liferay.com* ]]
+	if [[ "${file_url}" != http://mirrors.*.liferay.com* ]] &&
+	[[ "${file_url}" != http://release-1* ]] &&
+	[[ "${file_url}" != https://release.liferay.com* ]]
 	then
 		if [ ! -n "${LIFERAY_DOCKER_MIRROR}" ]
 		then
 			LIFERAY_DOCKER_MIRROR=lax
 		fi
 
-		file_url=http://mirrors.${LIFERAY_DOCKER_MIRROR}.liferay.com/${file_url##*//}
+		file_url="http://mirrors.${LIFERAY_DOCKER_MIRROR}.liferay.com/"${file_url##*//}
 	fi
 
 	echo ""
 	echo "Downloading ${file_url}."
 	echo ""
 
-	mkdir -p $(dirname ${file_name})
+	mkdir -p $(dirname "${file_name}")
 
-	curl ${LIFERAY_DOCKER_CURL_OPTIONS} -f -o ${file_name} ${file_url} || exit 2
+	curl ${LIFERAY_DOCKER_CURL_OPTIONS} -f -o "${file_name}" "${file_url}" || exit 2
 }
 
 function get_docker_image_tags_args {
@@ -91,20 +91,19 @@ function get_docker_image_tags_args {
 		docker_image_tags_args="${docker_image_tags_args} --tag ${docker_image_tag}"
 	done
 
-	echo ${docker_image_tags_args}
+	echo "${docker_image_tags_args}"
 }
 
 function get_tomcat_version {
-	if [ -e ${1}/tomcat-* ]
-	then
-		for temp_file_name in `ls ${1}`
-		do
-			if [[ ${temp_file_name} == tomcat-* ]]
-			then
-				local liferay_tomcat_version=${temp_file_name#*-}
-			fi
-		done
-	fi
+	for temp_file_name in "${1}"/tomcat-*
+	do
+		if [ -e  "${temp_file_name}" ]
+		then
+			local tomcat_folder=${temp_file_name##*/}
+			local liferay_tomcat_version=${tomcat_folder#*-}
+		fi
+		break
+	done
 
 	if [ -z ${liferay_tomcat_version+x} ]
 	then
@@ -113,48 +112,48 @@ function get_tomcat_version {
 		exit 1
 	fi
 
-	echo ${liferay_tomcat_version}
+	echo "${liferay_tomcat_version}"
 }
 
 function make_temp_directory {
 	CURRENT_DATE=$(date)
 
 	TIMESTAMP=$(date "${CURRENT_DATE}" "+%Y%m%d%H%M%S")
 
-	TEMP_DIR=temp-${TIMESTAMP}
+	TEMP_DIR="temp-${TIMESTAMP}"
 
-	mkdir -p ${TEMP_DIR}
+	mkdir -p "${TEMP_DIR}"
 
-	cp -r ${1}/* ${TEMP_DIR}
+	cp -r "${1}"/* "${TEMP_DIR}"
 }
 
 function pid_8080 {
-	local pid=`lsof -i 4tcp:8080 -sTCP:LISTEN -Fp | head -n 1`
+	local pid=$(lsof -Fp -i 4tcp:8080 -sTCP:LISTEN | head -n 1)
 
-	echo ${pid##p}
+	"echo ${pid##p}"
 }
 
 function prepare_tomcat {
-	local liferay_tomcat_version=$(get_tomcat_version ${TEMP_DIR}/liferay)
+	local liferay_tomcat_version=$(get_tomcat_version "${TEMP_DIR}/liferay")
 
-	mv ${TEMP_DIR}/liferay/tomcat-${liferay_tomcat_version} ${TEMP_DIR}/liferay/tomcat
+	mv "${TEMP_DIR}/liferay/tomcat-${liferay_tomcat_version}" "${TEMP_DIR}/liferay/tomcat"
 
-	ln -s tomcat ${TEMP_DIR}/liferay/tomcat-${liferay_tomcat_version}
+	ln -s tomcat "${TEMP_DIR}/liferay/tomcat-${liferay_tomcat_version}"
 
 	configure_tomcat
 
 	warm_up_tomcat
 
-	rm -fr ${TEMP_DIR}/liferay/logs/*
-	rm -fr ${TEMP_DIR}/liferay/tomcat/logs/*
+	rm -fr "${TEMP_DIR}"/liferay/logs/*
+	rm -fr "${TEMP_DIR}"/liferay/tomcat/logs/*
 }
 
 function push_docker_images {
 	if [ "${1}" == "push" ]
 	then
 		for docker_image_tag in "${DOCKER_IMAGE_TAGS[@]}"
 		do
-			docker push ${docker_image_tag}
+			docker push "${docker_image_tag}"
 		done
 	fi
 }
@@ -177,34 +176,34 @@ function start_tomcat {
 		echo "Killing process ${pid} that is listening on port 8080."
 		echo ""
 
-		kill -9 ${pid} 2>/dev/null
+		kill -9 "${pid}" 2>/dev/null
 	fi
 
-	./${TEMP_DIR}/liferay/tomcat/bin/catalina.sh start
+	"./${TEMP_DIR}/liferay/tomcat/bin/catalina.sh" start
 
-	until $(curl --head --fail --output /dev/null --silent http://localhost:8080)
+	until curl --fail --head --output /dev/null --silent http://localhost:8080
 	do
 		sleep 3
 	done
 
 	pid=$(pid_8080)
 
-	./${TEMP_DIR}/liferay/tomcat/bin/catalina.sh stop
+	"./${TEMP_DIR}/liferay/tomcat/bin/catalina.sh" stop
 
 	sleep 30
 
-	kill -9 ${pid} 2>/dev/null
+	kill -9 "${pid}" 2>/dev/null
 
-	rm -fr ${TEMP_DIR}/liferay/data/osgi/state
-	rm -fr ${TEMP_DIR}/liferay/osgi/state
+	rm -fr "${TEMP_DIR}/liferay/data/osgi/state"
+	rm -fr "${TEMP_DIR}/liferay/osgi/state"
 }
 
 function stat {
 	if [ "$(uname)" == "Darwin" ]
 	then
-		echo $(/usr/bin/stat -f "%z" "${1}")
+		/usr/bin/stat -f "%z" "${1}"
 	else
-		echo $(/usr/bin/stat --printf="%s" "${1}")
+		/usr/bin/stat --printf="%s" "${1}"
 	fi
 }
 
@@ -228,19 +227,19 @@ function warm_up_tomcat {
 	# the Hypersonic files can take over 20 seconds.
 	#
 
-	if [ -d ${TEMP_DIR}/liferay/data/hsql ]
+	if [ -d "${TEMP_DIR}/liferay/data/hsql" ]
 	then
-		if [ $(stat ${TEMP_DIR}/liferay/data/hsql/lportal.script) -lt 1024000 ]
+		if [ $(stat "${TEMP_DIR}/liferay/data/hsql/lportal.script") -lt 1024000 ]
 		then
 			start_tomcat
 		else
 			echo Tomcat is already warmed up.
 		fi
 	fi
 
-	if [ -d ${TEMP_DIR}/liferay/data/hypersonic ]
+	if [ -d "${TEMP_DIR}/liferay/data/hypersonic" ]
 	then
-		if [ $(stat ${TEMP_DIR}/liferay/data/hypersonic/lportal.script) -lt 1024000 ]
+		if [ $(stat "${TEMP_DIR}/liferay/data/hypersonic/lportal.script") -lt 1024000 ]
 		then
 			start_tomcat
 		else