Przeglądaj źródła

Update monica (v4.0.0)

Alexis Saettler 2 lat temu
rodzic
commit
70ddc80238

+ 10 - 10
library/monica

@@ -1,19 +1,19 @@
-# This file is generated via https://github.com/monicahq/docker/blob/1969cbd6d7dd410df84a18f539836ed4e0788324/generate-stackbrew-library.sh
+# This file is generated via https://github.com/monicahq/docker/blob/7337376d98838bc3ab2b7517da05a89e830d68b1/generate-stackbrew-library.sh
 Maintainers: Alexis Saettler <[email protected]> (@asbiin)
 GitRepo: https://github.com/monicahq/docker.git
 GitFetch: refs/heads/main
 
 Tags: 4.0.0-apache, 4.0-apache, 4-apache, apache, 4.0.0, 4.0, 4, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-Directory: apache
-GitCommit: 1969cbd6d7dd410df84a18f539836ed4e0788324
-
-Tags: 4.0.0-fpm-alpine, 4.0-fpm-alpine, 4-fpm-alpine, fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-Directory: fpm-alpine
-GitCommit: 1969cbd6d7dd410df84a18f539836ed4e0788324
+Directory: 4/apache
+GitCommit: 96189780c639d1511691a3151dd4d90d2f757ee3
 
 Tags: 4.0.0-fpm, 4.0-fpm, 4-fpm, fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-Directory: fpm
-GitCommit: 1969cbd6d7dd410df84a18f539836ed4e0788324
+Directory: 4/fpm
+GitCommit: 96189780c639d1511691a3151dd4d90d2f757ee3
+
+Tags: 4.0.0-fpm-alpine, 4.0-fpm-alpine, 4-fpm-alpine, fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+Directory: 4/fpm-alpine
+GitCommit: 96189780c639d1511691a3151dd4d90d2f757ee3

+ 7 - 3
test/tests/monica-apache-run/run.sh

@@ -15,7 +15,7 @@ fi
 mysqlCid="$(docker run -d \
 	-e MYSQL_RANDOM_ROOT_PASSWORD=true \
 	-e MYSQL_DATABASE=monica \
-	-e MYSQL_USER=homestead \
+	-e MYSQL_USER=monica \
 	-e MYSQL_PASSWORD=secret \
 	"$dbImage")"
 trap "docker rm -vf $mysqlCid > /dev/null" EXIT
@@ -23,6 +23,10 @@ trap "docker rm -vf $mysqlCid > /dev/null" EXIT
 cid="$(docker run -d \
 	--link "$mysqlCid":mysql \
 	-e DB_HOST=mysql \
+	-e DB_CONNECTION=mysql \
+	-e DB_DATABASE=monica \
+	-e DB_USERNAME=monica \
+	-e DB_PASSWORD=secret \
 	"$image")"
 trap "docker rm -vf $cid $mysqlCid > /dev/null" EXIT
 
@@ -40,5 +44,5 @@ _request() {
 # Make sure that Apache is listening and ready
 . "$dir/../../retry.sh" --tries 30 '_request GET / --output /dev/null'
 
-# Check that we can request / and that it contains the pattern "Welcome" somewhere
-_request GET '/' | grep -i "Welcome" > /dev/null
+# Check that we can request / and that it contains the pattern "Monica" somewhere
+_request GET '/' | grep -i "Monica" > /dev/null

+ 5 - 1
test/tests/monica-cli-mariadb10/run.sh

@@ -15,7 +15,7 @@ fi
 mysqlCid="$(docker run -d \
 	-e MYSQL_RANDOM_ROOT_PASSWORD=true \
 	-e MYSQL_DATABASE=monica \
-	-e MYSQL_USER=homestead \
+	-e MYSQL_USER=monica \
 	-e MYSQL_PASSWORD=secret \
 	"$dbImage")"
 trap "docker rm -vf $mysqlCid > /dev/null" EXIT
@@ -23,6 +23,10 @@ trap "docker rm -vf $mysqlCid > /dev/null" EXIT
 cid="$(docker run -d \
 	--link "$mysqlCid":mysql \
 	-e DB_HOST=mysql \
+	-e DB_CONNECTION=mysql \
+	-e DB_DATABASE=monica \
+	-e DB_USERNAME=monica \
+	-e DB_PASSWORD=secret \
 	"$image")"
 trap "docker rm -vf $cid $mysqlCid > /dev/null" EXIT
 

+ 5 - 1
test/tests/monica-cli-mysql8/run.sh

@@ -15,7 +15,7 @@ fi
 mysqlCid="$(docker run -d \
 	-e MYSQL_RANDOM_ROOT_PASSWORD=true \
 	-e MYSQL_DATABASE=monica \
-	-e MYSQL_USER=homestead \
+	-e MYSQL_USER=monica \
 	-e MYSQL_PASSWORD=secret \
 	"$dbImage")"
 trap "docker rm -vf $mysqlCid > /dev/null" EXIT
@@ -23,6 +23,10 @@ trap "docker rm -vf $mysqlCid > /dev/null" EXIT
 cid="$(docker run -d \
 	--link "$mysqlCid":mysql \
 	-e DB_HOST=mysql \
+	-e DB_CONNECTION=mysql \
+	-e DB_DATABASE=monica \
+	-e DB_USERNAME=monica \
+	-e DB_PASSWORD=secret \
 	"$image")"
 trap "docker rm -vf $cid $mysqlCid > /dev/null" EXIT
 

+ 5 - 1
test/tests/monica-cli/run.sh

@@ -15,7 +15,7 @@ fi
 mysqlCid="$(docker run -d \
 	-e MYSQL_RANDOM_ROOT_PASSWORD=true \
 	-e MYSQL_DATABASE=monica \
-	-e MYSQL_USER=homestead \
+	-e MYSQL_USER=monica \
 	-e MYSQL_PASSWORD=secret \
 	"$dbImage")"
 trap "docker rm -vf $mysqlCid > /dev/null" EXIT
@@ -23,6 +23,10 @@ trap "docker rm -vf $mysqlCid > /dev/null" EXIT
 cid="$(docker run -d \
 	--link "$mysqlCid":mysql \
 	-e DB_HOST=mysql \
+	-e DB_CONNECTION=mysql \
+	-e DB_DATABASE=monica \
+	-e DB_USERNAME=monica \
+	-e DB_PASSWORD=secret \
 	"$image")"
 trap "docker rm -vf $cid $mysqlCid > /dev/null" EXIT
 

+ 9 - 5
test/tests/monica-fpm-run/run.sh

@@ -8,9 +8,9 @@ image="$1"
 # Build a client image with cgi-fcgi for testing
 clientImage="librarytest/monica-fpm-run:fcgi-client"
 docker build -t "$clientImage" - > /dev/null <<'EOF'
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
-RUN set -x && apt-get update && apt-get install -y libfcgi0ldbl && rm -rf /var/lib/apt/lists/*
+RUN set -x && apt-get update && apt-get install -y --no-install-recommends libfcgi-bin && rm -rf /var/lib/apt/lists/*
 
 ENTRYPOINT ["cgi-fcgi"]
 EOF
@@ -25,7 +25,7 @@ fi
 mysqlCid="$(docker run -d \
 	-e MYSQL_RANDOM_ROOT_PASSWORD=true \
 	-e MYSQL_DATABASE=monica \
-	-e MYSQL_USER=homestead \
+	-e MYSQL_USER=monica \
 	-e MYSQL_PASSWORD=secret \
 	"$dbImage")"
 trap "docker rm -vf $mysqlCid > /dev/null" EXIT
@@ -33,6 +33,10 @@ trap "docker rm -vf $mysqlCid > /dev/null" EXIT
 cid="$(docker run -d \
 	--link "$mysqlCid":mysql \
 	-e DB_HOST=mysql \
+	-e DB_CONNECTION=mysql \
+	-e DB_DATABASE=monica \
+	-e DB_USERNAME=monica \
+	-e DB_PASSWORD=secret \
 	"$image")"
 trap "docker rm -vf $cid $mysqlCid > /dev/null" EXIT
 
@@ -60,5 +64,5 @@ fcgi-request() {
 # Make sure that PHP-FPM is listening and ready
 . "$dir/../../retry.sh" --tries 30 'fcgi-request GET /index.php' > /dev/null 2>&1
 
-# Check that we can request /register and that it contains the pattern "Welcome" somewhere
-fcgi-request GET '/index.php' register | grep -i "Welcome" > /dev/null
+# Check that we can request /register and that it contains the pattern "Monica" somewhere
+fcgi-request GET '/index.php' register | grep -i "Monica" > /dev/null