From 388da01d0bf0cac1677882074b902d7a151d4058 Mon Sep 17 00:00:00 2001
From: Olof Hagsand <olof@hagsand.se>
Date: Sat, 17 Aug 2019 14:55:44 +0000
Subject: [PATCH] base hello docker example

---
 docker/base/Dockerfile    | 9 +++------
 example/hello/Makefile.in | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index 76cc1520..16b70f0a 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -67,11 +67,11 @@ RUN make
 RUN make install
 RUN make install-include
 
-# Build and install the clixon example (not really necessary for base)
-WORKDIR /clixon/clixon/example
+# Build and install the clixon hello example (not really necessary for base)
+WORKDIR /clixon/clixon/example/hello
 RUN make
 RUN make install
-RUN install example.xml /clixon/build/etc/clixon.xml
+RUN install hello.xml /clixon/build/etc/clixon.xml # For 2nd level
 
 #
 # Stage 2
@@ -87,9 +87,6 @@ RUN adduser -D -H www-data
 # nginx adds group www-data
 RUN apk add --update nginx
 
-# Test-specific (for test scripts)
-#RUN apk add --update sudo curl bash
-
 # Expose nginx port for restconf
 EXPOSE 80
 
diff --git a/example/hello/Makefile.in b/example/hello/Makefile.in
index f29d11ef..28cbffd8 100644
--- a/example/hello/Makefile.in
+++ b/example/hello/Makefile.in
@@ -118,8 +118,8 @@ clean:
 distclean: clean
 	rm -f Makefile *~ .depend
 
-
 install: $(YANGSPECS) $(CLISPECS) $(PLUGINS) $(APPNAME).xml
+	install -d -m 0755 $(dir $(DESTDIR)$(CLIXON_DEFAULT_CONFIG))
 	install -m 0644 $(APPNAME).xml $(DESTDIR)$(CLIXON_DEFAULT_CONFIG)
 	install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)
 	install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/clispec