finalized updating docker

build-all.sh

@@ -41,7 +41,9 @@ do
       ~/go/bin/gox -osarch="${plat}/${arc}" \
         -ldflags "-X main.buildstamp=`date -u '+%Y%m%dT%H:%M:%SZ'` -X main.builtfordb=${dbtag}" \
         -tags ${dbtag} -output $GOPATH/bin/tinode ./server > /dev/null
-      ~/go/bin/gox -osarch="${plat}/${arc}" -tags ${dbtag} -output $GOPATH/bin/init-db ./tinode-db > /dev/null
+      ~/go/bin/gox -osarch="${plat}/${arc}" \
+        -ldflags "-X main.builtfordb=${dbtag}" \
+        -tags ${dbtag} -output $GOPATH/bin/init-db ./tinode-db > /dev/null
       # Tar on Mac is inflexible about directories. Let's just copy release files to
       # one directory.
       rm -fR ./releases/tmp

docker-build.sh

@@ -13,7 +13,16 @@ if [ -z "$tag" ]; then
     exit 1
 fi
 
-ver=( ${tag//./ } )                 # replace points, split into array
+# Convert tag into a version
+ver=( ${tag//./ } )
+
+# Remove earlier builds
+docker rmi tinode/tinode-rethinkdb:latest
+docker rmi tinode/tinode-rethinkdb:"${ver[0]}.${ver[1]}.${ver[2]}"
+docker rmi tinode/tinode-rethinkdb:"${ver[0]}.${ver[1]}"
+docker rmi tinode/tinode-mysql:latest
+docker rmi tinode/tinode-mysql:"${ver[0]}.${ver[1]}.${ver[2]}"
+docker rmi tinode/tinode-mysql:"${ver[0]}.${ver[1]}"
 
 # Build a docker image
 docker build --build-arg TARGET_DB=rethinkdb --tag tinode-rethinkdb \

docker/tinode/config.template

@@ -33,7 +33,7 @@
 		"adapters": {
 			"mysql": {
 				"database": "tinode",
-				"dsn": "root@tcp(mysql)/tinode?parseTime=true"
+				"dsn": "root@tcp(mysql)/?parseTime=true"
 			},
 			"rethinkdb": {
 				"database": "tinode",

tinode-db/makedb.go

@@ -145,10 +145,13 @@ func getPassword(n int) string {
 	return string(b)
 }
 
+// Database adapter that this binary was built for. Defined at compile time.
+var builtfordb = ""
+
 func main() {
 	var reset = flag.Bool("reset", false, "first delete the database if one exists")
 	var datafile = flag.String("data", "", "name of file with sample data")
-	var useAdapter = flag.String("store_use_adapter", "", "override default database adapter")
+	var useAdapter = flag.String("store_use_adapter", builtfordb, "override default database adapter")
 	var conffile = flag.String("config", "./tinode.conf", "config of the database connection")
 	flag.Parse()