Clixon 5.4.0 release
This commit is contained in:
Olof hagsand
parent
716d0cb15f
commit
6ab4e9dfdf
13 changed files with 96 additions and 79 deletions
|
|
@ -3,5 +3,5 @@
|
|||
This directory contains sub-directories with examples of Clixon docker images:
|
||||
|
||||
* [base](base/README.md) Clixon base image
|
||||
* [main](main/README.md) Main example and test application
|
||||
* [main](main/README.md) Main example and test application used in upstream CI
|
||||
|
||||
|
|
|
|||
|
|
@ -38,15 +38,18 @@ MAINTAINER Olof Hagsand <olof@hagsand.se>
|
|||
# For clixon and cligen
|
||||
RUN apk add --update git make build-base gcc flex bison curl-dev
|
||||
|
||||
# evhtp dependencies
|
||||
RUN apk add --update libevent libevent-dev
|
||||
|
||||
# nghttp2 dependencies
|
||||
RUN apk add --update nghttp2
|
||||
|
||||
# Create a directory to hold source-code, dependencies etc
|
||||
RUN mkdir /clixon
|
||||
|
||||
# libevht
|
||||
# dependencies
|
||||
RUN apk add --update libevent cmake libevent-dev
|
||||
|
||||
# clone libevhtp
|
||||
WORKDIR /clixon
|
||||
|
||||
RUN git clone https://github.com/clicon/clixon-libevhtp.git
|
||||
WORKDIR /clixon/clixon-libevhtp
|
||||
RUN ./configure
|
||||
|
|
@ -67,19 +70,16 @@ RUN ./configure --prefix=/clixon/build
|
|||
RUN make
|
||||
RUN make install
|
||||
|
||||
# Need to add www user manually
|
||||
RUN adduser -D -H -G www-data www-data
|
||||
|
||||
# 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 --with-restconf=native
|
||||
|
||||
RUN make
|
||||
RUN make install
|
||||
RUN ./configure --prefix=/clixon/build --with-cligen=/clixon/build --with-restconf=native --enable-nghttp2 --enable-evhtp
|
||||
|
||||
RUN make
|
||||
RUN make install
|
||||
|
|
@ -94,25 +94,19 @@ MAINTAINER Olof Hagsand <olof@hagsand.se>
|
|||
RUN apk add --update flex bison
|
||||
|
||||
# need to add www user manually
|
||||
RUN adduser -D -H www-data
|
||||
RUN adduser -D -H -G www-data www-data
|
||||
# for libevtp
|
||||
RUN apk add --update openssl libevent
|
||||
|
||||
# Test-specific (for test scripts) XXX Maybe remove those?
|
||||
RUN apk add --update sudo curl procps grep make bash
|
||||
# nghttp2 dependencies
|
||||
RUN apk add --update nghttp2
|
||||
|
||||
# Expose https port for restconf
|
||||
EXPOSE 80
|
||||
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
|
||||
|
||||
# Manually created
|
||||
RUN chown www-data /www-data
|
||||
RUN chgrp www-data /www-data
|
||||
|
||||
|
||||
COPY --from=0 /usr/local/lib/libevhtp.so* /usr/local/lib/
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ IMG = clixon/clixon # base image
|
|||
|
||||
SHELL = /bin/sh
|
||||
|
||||
.PHONY: all clean distclean docker push depend install-include install uninstall test
|
||||
.PHONY: all clean distclean docker push depend install-include install uninstall
|
||||
|
||||
all:
|
||||
echo "Run make docker to build docker image"
|
||||
|
|
@ -59,8 +59,6 @@ clean:
|
|||
distclean: clean
|
||||
rm -f Makefile *~ .depend
|
||||
|
||||
test:
|
||||
|
||||
docker: clixon Dockerfile
|
||||
sudo docker build -t $(IMG) . # --no-cache
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
# Clixon base docker image
|
||||
|
||||
This directory contains code for building and pushing the clixon base docker
|
||||
container. By default it is pushed to docker hub clixon/clixon, but you can change
|
||||
the IMAGE in Makefile.in and push it to another name.
|
||||
This directory contains code for building a clixon base docker container.
|
||||
|
||||
This clixon base container uses native http.
|
||||
|
||||
|
|
@ -10,12 +8,12 @@ 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.
|
||||
|
||||
See [clixon-system](../main/README.md) for a more complete clixon image.
|
||||
|
||||
## Build and push
|
||||
## 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>)
|
||||
|
|
|
|||
|
|
@ -1,13 +1,44 @@
|
|||
#!/bin/bash
|
||||
# ***** 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 *****
|
||||
|
||||
# Usage: ./startup.sh
|
||||
# Debug: DBG=1 ./startup.sh
|
||||
# See also cleanup.sh
|
||||
|
||||
>&2 echo "Running script: $0"
|
||||
|
||||
|
||||
# Start clixon-example backend
|
||||
sudo docker run --name clixon --rm -td clixon/clixon || err "Error starting clixon"
|
||||
sudo docker run --name clixon --rm -td clixon/clixon || err "Error starting clixon"
|
||||
|
||||
>&2 echo "clixon started"
|
||||
|
||||
|
|
|
|||
|
|
@ -153,10 +153,5 @@ COPY --from=0 /usr/local/share/yang/* /usr/local/share/yang/standard/
|
|||
COPY --from=0 /usr/local/share/yang/* /usr/local/share/yang/experimental/
|
||||
COPY --from=0 /usr/local/share/openconfig/* /usr/local/share/openconfig/
|
||||
|
||||
# Manually created
|
||||
RUN mkdir /www-data
|
||||
RUN chown clicon /www-data
|
||||
RUN chgrp clicon /www-data
|
||||
|
||||
# Start the backend and restconf deamons
|
||||
CMD /usr/local/bin/startsystem.sh
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ The directory contains the following files:
|
|||
- Dockerfile.fcgi Docker build instructions with nginx/fcgi restconf (this is default)
|
||||
- Dockerfile.native Docker build instructions with native restconf
|
||||
- Makefile.in "make docker" builds the container
|
||||
- README.md This file
|
||||
- README.md This file
|
||||
- start.sh Start containers
|
||||
- startsystem.sh Internal start script copied to inside the container (dont run from shell).
|
||||
- startsystem_fcgi.sh Variant for nginx/fcgi (default)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue