Merge pull request #1 from grafana/pin-demo-versions

Pin the versions of the demo app.

Author: tomwilkie

Makefile

@@ -23,14 +23,17 @@ loadgen/loadgen: loadgen/*.go
 
 db/.uptodate: db/db db/Dockerfile
 	docker build -t $(DOCKER_IMAGE_BASE)/tns-db db/
+	docker tag $(DOCKER_IMAGE_BASE)/tns-db $(DOCKER_IMAGE_BASE)/tns-db:$(IMAGE_TAG)
 	touch $@
 
 app/.uptodate: app/app app/Dockerfile app/index.html.tmpl
 	docker build -t $(DOCKER_IMAGE_BASE)/tns-app app/
+	docker tag $(DOCKER_IMAGE_BASE)/tns-app $(DOCKER_IMAGE_BASE)/tns-app:$(IMAGE_TAG)
 	touch $@
 
 loadgen/.uptodate: loadgen/loadgen loadgen/Dockerfile
 	docker build -t $(DOCKER_IMAGE_BASE)/tns-loadgen loadgen/
+	docker tag $(DOCKER_IMAGE_BASE)/tns-loadgen $(DOCKER_IMAGE_BASE)/tns-loadgen:$(IMAGE_TAG)
 	touch $@
 
 lint-image/.uptodate: lint-image/Dockerfile

production/docker-compose.yml

@@ -2,7 +2,7 @@ version: "2"
 services:
 
   db:
-    image: grafana/tns-db
+    image: grafana/tns-db:9c1ab38
     command:
       - '-log.level=debug'
     ports:
@@ -14,7 +14,7 @@ services:
       JAEGER_SAMPLER_PARAM: 1
 
   app:
-    image: grafana/tns-app
+    image: grafana/tns-app:9c1ab38
     command:
       - '-log.level=debug'
       - 'http://db'
@@ -29,7 +29,7 @@ services:
       JAEGER_SAMPLER_PARAM: 1
 
   loadgen:
-    image: grafana/tns-loadgen
+    image: grafana/tns-loadgen:9c1ab38
     command:
       - '-log.level=debug'
       - 'http://app'