diff --git a/CHANGELOG.md b/CHANGELOG.md index 030813db..b6b02135 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,7 +52,7 @@ ### Minor changes -* Updated the docker image build and changed it to build a single clixon docker image which can be found at olofhagsand/clixon. +* Updated the docker image build and changed it to build a single clixon docker image which can be found at olofhagsand/clixon. And the example at olofhagsand/clixon_example. * Added systemd example files under example/systemd * Changed `plugin_init()` backend return semantics: If returns NULL, _without_ calling clicon_err(), the module is disabled. * Added util subdir, with dedicated standalone xml,json,yang and xpath parser utility test programs. diff --git a/example/Makefile.in b/example/Makefile.in index 336968bf..ce86c28b 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -51,11 +51,13 @@ CLI_PLUGIN = $(APPNAME)_cli.so NETCONF_PLUGIN = $(APPNAME)_netconf.so RESTCONF_PLUGIN = $(APPNAME)_restconf.so -# Example docker image +# Example docker image. PLEASE CHANGE THIS IMAGE = olofhagsand/clixon_example PLUGINS = $(BE_PLUGIN) $(BE2_PLUGIN) $(CLI_PLUGIN) $(NETCONF_PLUGIN) $(RESTCONF_PLUGIN) +.PHONY: all clean depend install docker push + all: $(PLUGINS) # Note: clixon.mk has rules for clixon_DBSPECDIR, clixon_SYSCONFDIR, etc used below @@ -131,10 +133,10 @@ install: $(YANGSPECS) $(CLISPECS) $(BE_PLUGIN) $(BE2_PLUGIN) $(CLI_PLUGIN) $(NET install -d -m 0755 $(DESTDIR)$(clixon_LOCALSTATEDIR) docker: - sudo docker build -t $(IMAGE) . + sudo docker build -t $(IMAGE) . push: - sudo docker push $(IMAGE) + sudo docker push $(IMAGE) uninstall: