19e21be0bc
Major New features
* New and updated search functions using xpath, api-path and instance-id
* New search functions using api-path and instance_id:
* C search functions: `clixon_find_instance_id()` and `clixon_find_api_path()`
* Binary search optimization in lists for indexed leafs in all three formats.
* This improves search performance to O(logN) which is drastical improvements for large lists.
* You can also register explicit indexes for making binary search (not only list keys)
* For more info, see docs at [paths](https://clixon-docs.readthedocs.io/en/latest/paths.html) and
[search](https://clixon-docs.readthedocs.io/en/latest/xml.html#searching-in-xml)
API changes on existing features (you may need to change your code)
* On failed validation of leafrefs, error message changed from: `No such leaf` to `No leaf <name> matching path <path>`.
* CLI Error message (clicon_rpc_generate_error()) changed when backend returns netconf error to be more descriptive:
* Original: `Config error: Validate failed. Edit and try again or discard changes: Invalid argument`
* New (example): `Netconf error: application operation-failed Identityref validation failed, undefined not derived from acl-base . Validate failed. Edit and try again or discard changes"
Minor changes
* Test framework
* Added `-- -S <file>` command-line to main example to be able to return any state to main example.
* Added `test/cicd` test scripts for running on a set of other hosts
* C-code restructuring
* clixon_yang.c partitioned and moved code into clixon_yang_parse_lib.c and clixon_yang_module.c and move back some code from clixon_yang_type.c.
* partly to reduce size, but most important to limit code that accesses internal yang structures, only clixon_yang.c does this now.
124 lines
3.3 KiB
Docker
124 lines
3.3 KiB
Docker
#
|
|
# ***** BEGIN LICENSE BLOCK *****
|
|
#
|
|
# Copyright (C) 2017-2020 Olof Hagsand
|
|
#
|
|
# 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 fcgi-dev curl-dev
|
|
|
|
# Create a directory to hold source-code, dependencies etc
|
|
RUN mkdir /clixon
|
|
RUN mkdir /clixon/build
|
|
WORKDIR /clixon
|
|
|
|
# Clone cligen
|
|
RUN git clone https://github.com/olofhagsand/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
|
|
# nginx adds group www-data
|
|
RUN apk add --update nginx
|
|
|
|
# Configure, build and install clixon
|
|
RUN ./configure --prefix=/clixon/build --with-cligen=/clixon/build --with-wwwuser=www-data --enable-optyangs
|
|
RUN make
|
|
RUN make install
|
|
RUN make install-include
|
|
|
|
# Install utils
|
|
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.sh startsystem.sh
|
|
RUN install startsystem.sh /clixon/build/bin/
|
|
|
|
#
|
|
# Stage 2
|
|
#
|
|
FROM alpine
|
|
MAINTAINER Olof Hagsand <olof@hagsand.se>
|
|
|
|
# For clixon and cligen
|
|
RUN apk add --update flex bison fcgi-dev
|
|
|
|
# need to add www user manually
|
|
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 procps grep make bash
|
|
|
|
# Expose nginx port for restconf
|
|
EXPOSE 80
|
|
|
|
# Create clicon user and group
|
|
RUN adduser -D -H clicon
|
|
RUN adduser nginx clicon
|
|
RUN adduser www-data clicon
|
|
|
|
COPY --from=0 /clixon/build/ /usr/local/
|
|
COPY --from=0 /www-data /www-data
|
|
|
|
# Manually created
|
|
RUN chown www-data /www-data
|
|
RUN chgrp www-data /www-data
|
|
|
|
# Log to stderr.
|
|
CMD /usr/local/bin/startsystem.sh
|