* Changed docker builds

* `clixon-test` built in `docker/test`
    * Renamed from `clixon-system` built in `docker/main`
  * `clixon-example` built in `docker/example`
    * Added netconf ssh subsystem
    * Renamed from `clixon` built in `docker/base`
* Added ietf-yang-schema-mount@2019-01-14.yang

docker/Makefile.in

@@ -41,8 +41,8 @@ LIBS    	= @LIBS@
 
 SHELL	= /bin/sh
 
-SUBDIRS  = base
-SUBDIRS  += main
+SUBDIRS  = example
+SUBDIRS  += test
 #SUBDIRS += cluster
 
 .PHONY: all clean distclean depend install-include install uninstall test $(SUBDIRS)
@@ -62,7 +62,7 @@ distclean: clean
 	do (cd $$i; $(MAKE) $(MFLAGS) $@); done
 
 test:
-	$(MAKE) -C main $(MFLAGS) $@
+	$(MAKE) -C test $(MFLAGS) $@
 
 depend:
 	for i in $(SUBDIRS); \

docker/README.md

@@ -2,8 +2,8 @@
 
 This directory contains sub-directories with examples of Clixon docker images:
 
-  * [base](base/README.md)   Clixon base image 
+  * [example](example/README.md)   Clixon main example image 
   * [clixon-dev](clixon-dev/README.md)  Clixon development image
-  * [main](main/README.md)   Main example and test application used in upstream CI
+  * [test](test/README.md)  Test scripts used in upstream CI
 
 

docker/base/README.md

@@ -1,20 +0,0 @@
-# Clixon base docker image
-
-This directory contains code for building a clixon base docker container.
-
-This clixon base container uses native http.
-
-The clixon docker base image can be used to build clixon
-applications. It has the whole code for a clixon release which it
-downloads from git.
-
-## Build
-
-Perform the build by `make docker`. This copies the latest _committed_ clixon code into the container.
-
-## Push
-
-You may also do `make push` if you want to push the image, but you may then consider changing the image name (in the makefile:s).
-
-(You may have to login for push with sudo docker login -u <username>)
-

docker/example/Dockerfile

@@ -69,6 +69,17 @@ RUN ./configure --prefix=/clixon/build --with-cligen=/clixon/build --with-restco
 
 RUN make
 RUN make install
+RUN make install-include
+
+# Install main example
+WORKDIR /clixon/clixon/example/main
+RUN make
+RUN make install
+
+# Copy startscript
+WORKDIR /clixon
+COPY startsystem.sh startsystem.sh 
+RUN install startsystem.sh /clixon/build/bin/
 
 #
 # Stage 2
@@ -95,3 +106,9 @@ EXPOSE 443/tcp
 RUN adduser -D -H clicon
 
 COPY --from=0 /clixon/build/ /usr/local/
+
+# Create symlink so you can run clixon without -f arg
+RUN ln -s /usr/local/etc/example.xml /usr/local/etc/clixon.xml 
+
+# Start daemons
+CMD /usr/local/bin/startsystem.sh

docker/example/Makefile.in

@@ -40,7 +40,7 @@ LDFLAGS 	= @LDFLAGS@
 LIBS    	= @LIBS@
 
 # docker.hub image. CHANGE THIS IF YOU PUSH YOUR OWN
-IMG   = clixon/clixon # base image
+IMG   = clixon/clixon-example
 
 SHELL	= /bin/sh
 
@@ -60,7 +60,7 @@ distclean: clean
 	rm -f Makefile *~ .depend
 
 docker: clixon Dockerfile
-	sudo docker build -t $(IMG) .  # --no-cache
+	sudo docker build -t $(IMG) $(DOCKERFLAGS) .
 
 push:
 	sudo docker push $(IMG)

docker/example/README.md

@@ -0,0 +1,46 @@
+# Clixon main example docker image
+
+This directory contains code for building a clixon main example docker container.
+
+This clixon example container uses native http.
+
+## Build
+
+Perform the build by `make docker`. This copies the latest _committed_ clixon code into the container.
+
+## Start
+
+Start the container:
+```
+  $ ./start.sh 
+```
+
+If you want to install your pre-existing pub rsa key in the container:
+
+```
+  $ SSHKEY=true ./start.sh 
+```
+
+## Run
+
+The CLI directly
+```
+  $ sudo docker exec -it clixon-example clixon_cli
+```
+
+The CLI via ssh (if keys setup correctly) where 172.x.x.x is the addresss of eth0
+```
+  $ ssh -t root@172.x.x.x clixon_cli
+```
+
+Netconf via ssh:
+```
+  $ ssh root@172.x.x.x -s netconf
+```
+
+## Push
+
+You may also do `make push` if you want to push the image, but you may then consider changing the image name (in the makefile:s).
+
+(You may have to login for push with sudo docker login -u <username>)
+

docker/example/cleanup.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Kill all controller containers (optionally do `make clean`)
+sudo docker kill clixon-example 2> /dev/null # ignore errors
+
+
+

docker/example/start.sh

@@ -35,13 +35,23 @@
 # Debug: DBG=1 ./startup.sh
 # See also cleanup.sh
 
+# If tru also install your users pubkey
+: ${SSHKEY:=false}
+
 >&2 echo "Running script: $0"
 
+sudo docker kill clixon-example 2> /dev/null # ignore errors
+
 # Start clixon-example backend
-sudo docker run --name clixon --rm -td clixon/clixon || err "Error starting clixon"
-
->&2 echo "clixon started"
-
-
+sudo docker run --name clixon-example --rm -td clixon/clixon-example #|| err "Error starting clixon-example"
 
+# Copy rsa pubkey 
+if $SSHKEY; then
+    # install user pub key 
+    sudo docker exec -it clixon-example mkdir -m 700 /root/.ssh
+    sudo docker cp ~/.ssh/id_rsa.pub clixon-example:/root/.ssh/authorized_keys
+    sudo docker exec -it clixon-example chown root /root/.ssh/authorized_keys
+    sudo docker exec -it clixon-example chgrp root /root/.ssh/authorized_keys
+fi
 
+>&2 echo "clixon-example started"

docker/example/startsystem.sh

@@ -0,0 +1,65 @@
+#!/bin/sh
+# ***** BEGIN LICENSE BLOCK *****
+# 
+# Copyright (C) 2017-2019 Olof Hagsand
+# Copyright (C) 2020-2022 Olof Hagsand and Rubicon Communications, LLC(Netgate)
+#
+# This file is part of CLIXON
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# the GNU General Public License Version 3 or later (the "GPL"),
+# in which case the provisions of the GPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of the GPL, and not to allow others to
+# use your version of this file under the terms of Apache License version 2, 
+# indicate your decision by deleting the provisions above and replace them with
+# the notice and other provisions required by the GPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the Apache License version 2 or the GPL.
+#
+# ***** END LICENSE BLOCK *****
+
+# Clixon startscript for native restconf and https
+# This script is copied into the container on build time and runs
+# _inside_ the container at start in runtime. It gets environment variables
+# from the start.sh script.
+# It starts a backend, a restconf daemon and exposes ports for restconf, and the sleeps
+# See also Dockerfile of the example
+# Log msg, see with docker logs
+
+set -ux # e but clixon_backend may fail if test is run in parallell
+
+>&2 echo "$0"
+
+# If set, enable debugging (of backend and restconf daemons)
+: ${DBG:=0}
+
+# Start sshd
+touch /run/openrc/softlevel
+/etc/init.d/sshd start
+
+# But dont use -s exposing local ports since there is problem with self-signed certs?
+#/usr/local/bin/clixon_restconf -l f/var/log/restconf.log -D $DBG &
+#>&2 echo "clixon_restconf started"
+
+ln -s /usr/local/etc/example.xml clixon.xml
+
+# Start clixon backend 
+/usr/local/sbin/clixon_backend -D $DBG -s running -l e -f /usr/local/etc/example.xml 
+>&2 echo "clixon_backend started"
+
+# Alt: let backend be in foreground, but test scripts may
+# want to restart backend
+/bin/sleep 100000000

docker/test/Dockerfile.native

@@ -167,5 +167,5 @@ COPY --from=0 /usr/local/share/openconfig/* /usr/local/share/openconfig/
 COPY --from=0 /usr/local/share/mib-yangs/* /usr/local/share/mib-yangs/
 COPY --from=0 /clixon/build/mibs/* /usr/share/snmp/mibs/
 
-# Start the backend and restconf deamons
+# Start daemons
 CMD /usr/local/bin/startsystem.sh