Browse Source

Update monica v2.20.0

Alexis Saettler 4 years ago
parent
commit
9e39b5d0ed
2 changed files with 22 additions and 10 deletions
  1. 7 7
      library/monica
  2. 15 3
      test/tests/monica-cli/run.sh

+ 7 - 7
library/monica

@@ -1,18 +1,18 @@
-# This file is generated via https://github.com/monicahq/docker/blob/d7628ea5587c7b99a0bfcc7fe812b8c256cdecfa/generate-stackbrew-library.sh
+# This file is generated via https://github.com/monicahq/docker/blob/37898d3e64f3bf26ae190673e65cfbd0ae4d9546/generate-stackbrew-library.sh
 Maintainers: Alexis Saettler <[email protected]> (@asbiin)
 GitRepo: https://github.com/monicahq/docker.git
 
-Tags: 2.19.1-apache, 2.19-apache, 2-apache, apache, 2.19.1, 2.19, 2, latest
+Tags: 2.20.0-apache, 2.20-apache, 2-apache, apache, 2.20.0, 2.20, 2, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 Directory: apache
-GitCommit: 1c9fd657cfc59067da9b30479ddf5cd04750b392
+GitCommit: 0930aec604aa54e3a5bfceb003ebe4f176808900
 
-Tags: 2.19.1-fpm, 2.19-fpm, 2-fpm, fpm
+Tags: 2.20.0-fpm, 2.20-fpm, 2-fpm, fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 Directory: fpm
-GitCommit: 1c9fd657cfc59067da9b30479ddf5cd04750b392
+GitCommit: 0930aec604aa54e3a5bfceb003ebe4f176808900
 
-Tags: 2.19.1-fpm-alpine, 2.19-fpm-alpine, 2-fpm-alpine, fpm-alpine
+Tags: 2.20.0-fpm-alpine, 2.20-fpm-alpine, 2-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 Directory: fpm-alpine
-GitCommit: 1c9fd657cfc59067da9b30479ddf5cd04750b392
+GitCommit: 0930aec604aa54e3a5bfceb003ebe4f176808900

+ 15 - 3
test/tests/monica-cli/run.sh

@@ -26,13 +26,25 @@ cid="$(docker run -d \
 	"$image")"
 trap "docker rm -vf $cid $mysqlCid > /dev/null" EXIT
 
+_logs() {
+	docker logs "$cid"
+}
+
 _artisan() {
 	docker exec "$cid" php artisan "$@"
 }
 
+_artisan_test() {
+	match=$1
+	shift
+	output=$(_artisan "$@")
+	echo $output | grep -iq "$match" || echo "'$match' not found in: $output"
+}
+
 # Give some time to install
-. "$dir/../../retry.sh" --tries 30 '_artisan migrate:status' > /dev/null
+. "$dir/../../retry.sh" --tries 30 '_logs | grep -iq "Monica v.* is set up, enjoy."'
 
 # Check if installation is complete
-_artisan monica:getversion
-_artisan schedule:run | grep -iq 'No scheduled commands are ready to run.'
+_artisan monica:getversion > /dev/null
+_artisan_test 'Running scheduled command:' schedule:run
+_artisan_test 'No scheduled commands are ready to run.' schedule:run