Escaping quotes in labels, updating go build for caddy

Author: mikeburgh

Dockerfile

@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.17
+ARG GOLANG_VERSION=1.19
 ARG ALPINE_VERSION=3.15
 
 #Use a builder to build caddy with the DNS plugin
@@ -11,11 +11,9 @@ WORKDIR /go/src/github.com/caddyserver/xcaddy/cmd/xcaddy
 RUN apk add --no-cache git gcc build-base; \
 	go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest;
 
-#this last with can probably be removed, it's temp due to an ambigous import!
 RUN  xcaddy build \
 	 --output /go/src/github.com/caddyserver/xcaddy/cmd/caddy \
-	 --with github.com/caddy-dns/cloudflare \
-	 --with github.com/antlr/antlr4=github.com/antlr/antlr4/runtime/Go/[email protected] 
+	 --with github.com/caddy-dns/cloudflare
 
 #Final Image
 FROM alpine:${ALPINE_VERSION}

entrypoint.sh

@@ -50,7 +50,7 @@ checkContainer() {
 	inspect=`docker inspect $id`
 
 	#get the hostname and config from our labels from the container!
-	read hostname name network ports labels< <(echo $(echo ${inspect} | jq --raw-output '.[0] | .Name as $name | .NetworkSettings as $network | .Config.ExposedPorts as $ports | .Config.Labels | . as $labels | to_entries[] | select(.key == "subway.hostname") | "\(.value) \($name) \($network) \($ports) \($labels)"'))
+	read hostname name network ports labels< <(echo $(echo ${inspect} | jq --raw-output '.[0] | .Name as $name | .NetworkSettings as $network | .Config.ExposedPorts as $ports | .Config.Labels | . as $labels | to_entries[] | select(.key == "subway.hostname") | "\(.value) \($name) \($network) \($ports) \($labels)"') | sed -r 's/\\"/\\\\"/g')
 	if [[ $hostname ]] 
 	then
 		echo "$(date -u +'%Y-%m-%dT%H:%M:%SZ') SUBWAY Container ${name:1} found with status ${action} and subway.hostname ${hostname}..."