Roger A. Light 5 жил өмнө
parent
commit
9e9de3a250

+ 7 - 1
library/eclipse-mosquitto

@@ -1,8 +1,14 @@
 Maintainers: Roger Light <[email protected]> (@ralight)
 GitRepo: https://github.com/eclipse/mosquitto.git
-GitCommit: 3a13205e5e7635fab23bc26ca3898fbfdeec4836
+GitCommit: 122e6ecfd3ec31084a4d25c1412b3d615c617148
 Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
 
+Tags: 2.0.0, 2.0
+Directory: docker/2.0
+
+Tags: 2.0.0-openssl, 2.0-openssl
+Directory: docker/2.0-openssl
+
 Tags: 1.6.12, 1.6, latest
 Directory: docker/1.6
 

+ 2 - 0
test/tests/eclipse-mosquitto-basics/mosquitto.conf

@@ -0,0 +1,2 @@
+listener 1883
+allow_anonymous true

+ 13 - 6
test/tests/eclipse-mosquitto-basics/run.sh

@@ -15,11 +15,18 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 image="$1"
 
+# Create an instance of the container-under-test
+serverImage="$("$dir/../image-name.sh" librarytest/eclipse-mosquitto-basics "$image")"
+"$dir/../docker-build.sh" "$dir" "$serverImage" <<EOD
+FROM $image
+COPY dir/mosquitto.conf /mosquitto/config/
+EOD
+
 cname="eclipse-mosquitto-container-$RANDOM-$RANDOM"
 cid="$(docker run -d \
 	--name "$cname" \
-	"$image"
-)"
+	"$serverImage")"
+
 trap "docker rm -vf $cid > /dev/null" EXIT
 
 _publish() {
@@ -30,8 +37,8 @@ _publish() {
 	shift
 
 	docker run --rm \
-		--link "$cname":eclipse-mosquitto \
-		"$image" \
+		--link "$cid":eclipse-mosquitto \
+		"$serverImage" \
 		mosquitto_pub \
 			-t $topic \
 			-m ${payload} \
@@ -44,8 +51,8 @@ _subscribe() {
 	shift
 
 	docker run --rm \
-		--link "$cname":eclipse-mosquitto \
-		"$image" \
+		--link "$cid":eclipse-mosquitto \
+		"$serverImage" \
 		mosquitto_sub \
 			-t $topic \
 			-C 1 \