update image and add test

library/monica

@@ -5,14 +5,14 @@ GitRepo: https://github.com/monicahq/docker.git
 Tags: 2.18.0-apache, 2.18-apache, 2-apache, apache, 2.18.0, 2.18, 2, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 Directory: apache
-GitCommit: b14e1fad850b6a78c8438d18462d565c95e23c2e
+GitCommit: 9567576624a2125526cbbe6d3892e1f9cf050a2d
 
 Tags: 2.18.0-fpm, 2.18-fpm, 2-fpm, fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 Directory: fpm
-GitCommit: b14e1fad850b6a78c8438d18462d565c95e23c2e
+GitCommit: 9567576624a2125526cbbe6d3892e1f9cf050a2d
 
 Tags: 2.18.0-fpm-alpine, 2.18-fpm-alpine, 2-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 Directory: fpm-alpine
-GitCommit: b14e1fad850b6a78c8438d18462d565c95e23c2e
+GitCommit: 9567576624a2125526cbbe6d3892e1f9cf050a2d

test/config.sh

@@ -122,6 +122,9 @@ imageTests+=(
 		mongo-tls-basics
 		mongo-tls-auth
 	'
+	[monica]='
+		monica-cli
+	'
 	[monica:apache]='
 		monica-apache-run
 	'

test/tests/monica-apache-run/run.sh

@@ -8,9 +8,18 @@ image="$1"
 mysqlImage='mysql:5.7'
 
 # Create an instance of the container-under-test
-mysqlCid="$(docker run -d -e MYSQL_RANDOM_ROOT_PASSWORD=true -e MYSQL_DATABASE=monica -e MYSQL_USER=homestead -e MYSQL_PASSWORD=secret "$mysqlImage")"
+mysqlCid="$(docker run -d \
+	-e MYSQL_RANDOM_ROOT_PASSWORD=true \
+	-e MYSQL_DATABASE=monica \
+	-e MYSQL_USER=homestead \
+	-e MYSQL_PASSWORD=secret \
+	"$mysqlImage")"
 trap "docker rm -vf $mysqlCid > /dev/null" EXIT
-cid="$(docker run -d --link "$mysqlCid":mysql -e DB_HOST=mysql "$image")"
+
+cid="$(docker run -d \
+	--link "$mysqlCid":mysql \
+	-e DB_HOST=mysql \
+	"$image")"
 trap "docker rm -vf $cid $mysqlCid > /dev/null" EXIT
 
 _request() {

test/tests/monica-cli/run.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+set -eo pipefail
+
+dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
+
+image="$1"
+
+mysqlImage='mysql:5.7'
+
+# Create an instance of the container-under-test
+mysqlCid="$(docker run -d \
+	-e MYSQL_RANDOM_ROOT_PASSWORD=true \
+	-e MYSQL_DATABASE=monica \
+	-e MYSQL_USER=homestead \
+	-e MYSQL_PASSWORD=secret \
+	"$mysqlImage")"
+trap "docker rm -vf $mysqlCid > /dev/null" EXIT
+
+cid="$(docker run -d \
+	--link "$mysqlCid":mysql \
+	-e DB_HOST=mysql \
+	"$image")"
+trap "docker rm -vf $cid $mysqlCid > /dev/null" EXIT
+
+_artisan() {
+	docker exec "$cid" php artisan "$@"
+}
+
+# Give some time to install
+. "$dir/../../retry.sh" --tries 30 '_artisan migrate:status' > /dev/null
+
+# Check if installation is complete
+_artisan monica:getversion
+_artisan schedule:run | grep -iq 'No scheduled commands are ready to run.'

test/tests/monica-fpm-run/run.sh

@@ -18,9 +18,18 @@ EOF
 mysqlImage='mysql:5.7'
 
 # Create an instance of the container-under-test
-mysqlCid="$(docker run -d -e MYSQL_RANDOM_ROOT_PASSWORD=true -e MYSQL_DATABASE=monica -e MYSQL_USER=homestead -e MYSQL_PASSWORD=secret "$mysqlImage")"
+mysqlCid="$(docker run -d \
+	-e MYSQL_RANDOM_ROOT_PASSWORD=true \
+	-e MYSQL_DATABASE=monica \
+	-e MYSQL_USER=homestead \
+	-e MYSQL_PASSWORD=secret \
+	"$mysqlImage")"
 trap "docker rm -vf $mysqlCid > /dev/null" EXIT
-cid="$(docker run -d --link "$mysqlCid":mysql -e DB_HOST=mysql "$image")"
+
+cid="$(docker run -d \
+	--link "$mysqlCid":mysql \
+	-e DB_HOST=mysql \
+	"$image")"
 trap "docker rm -vf $cid $mysqlCid > /dev/null" EXIT
 
 fcgi-request() {