Merge branch 'master' of https://github.com/clicon/clixon
This commit is contained in:
commit
ca18b7f49e
6 changed files with 11 additions and 7 deletions
|
|
@ -23,13 +23,14 @@ FROM ubuntu:14.04
|
|||
MAINTAINER Olof Hagsand <olof@hagsand.se>
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
RUN apt-get update && apt-get install -y libqdbm-dev
|
||||
RUN groupadd clicon
|
||||
COPY libcligen.so.@CLIGEN_VERSION@ /usr/lib/
|
||||
COPY libclixon.so.@CLIXON_VERSION_MAJOR@ /usr/lib/
|
||||
COPY libclixon_backend.so.@CLIXON_VERSION_MAJOR@ /usr/lib/
|
||||
COPY clixon_backend /usr/sbin/
|
||||
RUN ldconfig
|
||||
RUN sudo groupadd clixon
|
||||
CMD ["/usr/sbin/clixon_backend", "-D", "1", "-F", "-f", "/data/clixon.conf"]
|
||||
CMD ["/usr/sbin/clixon_backend", "-F", "-f", "/data/clixon.conf"]
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ FROM ubuntu:14.04
|
|||
MAINTAINER Olof Hagsand <olof@hagsand.se>
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
RUN apt-get update && apt-get install -y libqdbm-dev
|
||||
RUN groupadd clicon
|
||||
COPY libcligen.so.@CLIGEN_VERSION@ /usr/lib/
|
||||
COPY libclixon.so.@CLIXON_VERSION_MAJOR@ /usr/lib/
|
||||
COPY libclixon_cli.so.@CLIXON_VERSION_MAJOR@ /usr/lib/
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ FROM ubuntu:14.04
|
|||
MAINTAINER Olof Hagsand <olof@hagsand.se>
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
RUN apt-get update && apt-get install -y libqdbm-dev
|
||||
RUN groupadd clicon
|
||||
COPY libcligen.so.@CLIGEN_VERSION@ /usr/lib/
|
||||
COPY libclixon.so.@CLIXON_VERSION_MAJOR@ /usr/lib/
|
||||
COPY libclixon_netconf.so.@CLIXON_VERSION_MAJOR@ /usr/lib/
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ APPNAME = routing
|
|||
|
||||
all: $(APPNAME).conf
|
||||
|
||||
-include $(DESTDIR)$(datarootdir)/clicon/clicon.mk
|
||||
-include $(DESTDIR)$(datarootdir)/clixon/clixon.mk
|
||||
|
||||
# Kind of reverse install, could have copied from src dir,...
|
||||
.PHONY: docker push
|
||||
|
|
@ -40,7 +40,7 @@ docker: $(APPNAME).conf
|
|||
install -d data/cli
|
||||
install -d data/netconf
|
||||
install -d data/clispec
|
||||
install $(APPNAME).conf data/clicon.conf # docker image assumes /data/clicon.conf
|
||||
install $(APPNAME).conf data/clixon.conf # docker image assumes /data/clixon.conf
|
||||
install ../*.yang data/yang/
|
||||
install ../routing_cli.so data/cli/
|
||||
install ../routing_backend.so data/backend/
|
||||
|
|
|
|||
|
|
@ -2,5 +2,6 @@ Run the ietf routing example as docker container.
|
|||
Use the dockerhub container, or alternatively, build clicon as docker images
|
||||
by doing make docker in the top builddir.
|
||||
|
||||
make docker # Create shared file system
|
||||
run.sh # Run a backend and a cli
|
||||
(cd ..; make) # Make example
|
||||
make docker # Create config file and shared file system
|
||||
run.sh # Run a backend and a cli container
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Start daemon and a cli docker containers .
|
||||
# Note that they have a common file-system at /data
|
||||
#
|
||||
sudo docker run -td --net host -v $(pwd)/data:/data olofhagsand/clicon_backend
|
||||
sudo docker run -ti --rm --net host -v $(pwd)/data:/data olofhagsand/clicon_cli
|
||||
sudo docker run -td --net host -v $(pwd)/data:/data olofhagsand/clixon_backend
|
||||
sudo docker run -ti --rm --net host -v $(pwd)/data:/data olofhagsand/clixon_cli
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue