From 9466bab6351147e9cecafa798280bc7bee3df952 Mon Sep 17 00:00:00 2001
From: Olof Hagsand <olof@hagsand.se>
Date: Sun, 28 Feb 2016 17:23:55 +0100
Subject: [PATCH] docker

---
 example/docker/Makefile.in | 4 ++--
 example/docker/README      | 5 +++--
 example/docker/run.sh      | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/example/docker/Makefile.in b/example/docker/Makefile.in
index 493e68d4..75fb8445 100644
--- a/example/docker/Makefile.in
+++ b/example/docker/Makefile.in
@@ -29,7 +29,7 @@ APPNAME	        = routing
 
 all:	$(APPNAME).conf
 
--include $(DESTDIR)$(datarootdir)/clicon/clicon.mk
+-include $(DESTDIR)$(datarootdir)/clixon/clixon.mk
 
 # Kind of reverse install, could have copied from src dir,...
 .PHONY: docker push
@@ -40,7 +40,7 @@ docker:	$(APPNAME).conf
 	install -d data/cli
 	install -d data/netconf
 	install -d data/clispec
-	install $(APPNAME).conf data/clicon.conf # docker image assumes /data/clicon.conf
+	install $(APPNAME).conf data/clixon.conf # docker image assumes /data/clixon.conf
 	install ../*.yang data/yang/
 	install ../routing_cli.so data/cli/
 	install ../routing_backend.so data/backend/
diff --git a/example/docker/README b/example/docker/README
index 59a84417..2d93a6a9 100644
--- a/example/docker/README
+++ b/example/docker/README
@@ -2,5 +2,6 @@ Run the ietf routing example as docker container.
 Use the dockerhub container, or alternatively, build clicon as docker images
 by doing make docker in the top builddir.
 
-   make docker   # Create shared file system
-   run.sh        # Run a backend and a cli
+   (cd ..; make) # Make example
+   make docker   # Create config file and shared file system
+   run.sh        # Run a backend and a cli container
diff --git a/example/docker/run.sh b/example/docker/run.sh
index e1f703d4..295d5d4e 100755
--- a/example/docker/run.sh
+++ b/example/docker/run.sh
@@ -2,7 +2,7 @@
 # Start daemon and a cli docker containers .
 # Note that they have a common file-system at /data 
 #
-sudo docker run -td --net host -v $(pwd)/data:/data olofhagsand/clicon_backend
-sudo docker run -ti --rm --net host -v $(pwd)/data:/data olofhagsand/clicon_cli
+sudo docker run -td --net host -v $(pwd)/data:/data olofhagsand/clixon_backend
+sudo docker run -ti --rm --net host -v $(pwd)/data:/data olofhagsand/clixon_cli