- Added specific WITH_RESTCONF compile contants for _NATIVE and _FCGI for C code

- Restconf auth=none changes
  - Load clixon-restconf and resolve features earlier so that config features work
  - Removed auth=none code from example (this was non-std half-baked basic auth)
  - Changed tests that used auth-type=none to enable feature clixon-restconf:allow-auth-none
- Moved cert creation from sub-shell to servercert function
- Fixed typos for dockerfile rename of restconf evhtp to native

docker/main/Dockerfile.native

@@ -0,0 +1,140 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# 
+# Copyright (C) 2017-2019 Olof Hagsand
+# Copyright (C) 2020-2021 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 *****
+#
+
+FROM alpine
+MAINTAINER Olof Hagsand <olof@hagsand.se>
+
+# For clixon and cligen
+RUN apk add --update git make build-base gcc flex bison curl-dev
+
+# Create a directory to hold source-code, dependencies etc
+RUN mkdir /clixon
+
+# evhtp
+# dependencies
+RUN apk add --update libevent libevent-dev
+
+# clone libevhtp
+WORKDIR /clixon
+
+RUN git clone https://github.com/clicon/clixon-libevhtp.git
+WORKDIR /clixon/clixon-libevhtp
+RUN ./configure
+
+RUN make
+RUN mkdir /usr/local/include
+RUN make install
+
+RUN mkdir /clixon/build
+WORKDIR /clixon
+
+# Clone cligen
+RUN git clone https://github.com/clicon/cligen.git
+
+# Build cligen
+WORKDIR /clixon/cligen
+RUN ./configure --prefix=/clixon/build
+RUN make
+RUN make install
+
+# Copy Clixon from local dir
+RUN mkdir /clixon/clixon
+WORKDIR /clixon/clixon
+COPY clixon .
+
+# Need to add www user manually
+RUN adduser -D -H www-data
+
+# Configure, build and install clixon
+RUN ./configure --prefix=/clixon/build --with-cligen=/clixon/build --with-wwwuser=www-data --enable-optyangs --with-restconf=native
+
+RUN make
+RUN make install
+
+# Install utils (for tests)
+WORKDIR /clixon/clixon/util
+RUN make
+RUN make install
+
+# Build and install the clixon example
+WORKDIR /clixon/clixon/example/main
+RUN make
+RUN make install
+RUN install example.xml /clixon/build/etc/clixon.xml
+
+# Copy tests
+WORKDIR /clixon/clixon/test
+RUN install -d /clixon/build/bin/test
+RUN install *.sh /clixon/build/bin/test
+
+# Copy startscript
+WORKDIR /clixon
+COPY startsystem_evhtp.sh startsystem.sh 
+RUN install startsystem.sh /clixon/build/bin/
+
+#
+# Stage 2
+# The second step skips the development environment and builds a runtime system
+FROM alpine
+MAINTAINER Olof Hagsand <olof@hagsand.se>
+
+# For clixon and cligen
+RUN apk add --update flex bison
+
+# need to add www user manually
+RUN adduser -D -H www-data
+# for libevtp
+RUN apk add --update openssl libevent
+
+# Test-specific (for test scripts)
+RUN apk add --update sudo curl procps grep make bash # iproute2 # contains ip - but CAP_SYS_ADMIN isssue
+
+# Expose https port for restconf
+EXPOSE 80/tcp
+EXPOSE 443/tcp
+
+# Create clicon user and group
+RUN adduser -D -H clicon
+RUN adduser www-data clicon
+
+COPY --from=0 /clixon/build/ /usr/local/
+COPY --from=0 /www-data /www-data
+COPY --from=0 /usr/local/lib/libevhtp.so* /usr/local/lib/
+
+# Manually created
+RUN chown www-data /www-data
+RUN chgrp www-data /www-data
+
+# Log to stderr.
+CMD /usr/local/bin/startsystem.sh