experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed clixon base system container to use Alpine [docker/base](docker/base).

Browse source
This commit is contained in:
Olof Hagsand 2019-02-11 17:55:47 +01:00
parent 9cf4b0139a
commit f1be029f71
4 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -127,7 +127,8 @@
* Syntactically Correct handling of '<?' (processing instructions) and '<?xml' (XML declaration) * Syntactically Correct handling of '<?' (processing instructions) and '<?xml' (XML declaration)
* XML prolog syntax for 'well-formed' XML * XML prolog syntax for 'well-formed' XML
* `<!DOCTYPE` (ie DTD) is not supported. * `<!DOCTYPE` (ie DTD) is not supported.
* Added Clixon example full system docker container, see [docker/system]. * Added Clixon example full system docker container, see [docker/system](docker/system).
* Changed clixon base system container to use Alpine [docker/base](docker/base).
* clixon-config YAML file has new revision: 2019-02-06. * clixon-config YAML file has new revision: 2019-02-06.
* Replaced all calls to (obsolete) `cli_output` with `fprintf` * Replaced all calls to (obsolete) `cli_output` with `fprintf`
* Added _experimental_ config option `CLICON_CLI_UTF8` default set to 0. * Added _experimental_ config option `CLICON_CLI_UTF8` default set to 0.

19
docker/base/Dockerfile
View file

@ -31,14 +31,14 @@
# ***** END LICENSE BLOCK ***** # ***** END LICENSE BLOCK *****
# #
FROM debian FROM alpine
MAINTAINER Olof Hagsand <olof@hagsand.se> MAINTAINER Olof Hagsand <olof@hagsand.se>
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y \ # For clixon and cligen
git make gcc flex bison \ RUN apk add --update git make build-base gcc flex bison fcgi-dev curl-dev
libfcgi-dev \
libcurl4-openssl-dev # For debug
RUN apk add --update bash nano
# Create a directory to hold source-code, dependencies etc # Create a directory to hold source-code, dependencies etc
RUN mkdir /clixon RUN mkdir /clixon
@ -58,15 +58,12 @@ RUN mkdir /clixon/clixon
WORKDIR /clixon/clixon WORKDIR /clixon/clixon
COPY clixon . COPY clixon .
# Build clixon # Build clixon (without restconf if you dont have nginx)
RUN ./configure RUN ./configure --without-restconf
RUN make RUN make
RUN make install RUN make install
RUN make install-include RUN make install-include
RUN rm -rf /clixon
RUN ldconfig

5
docker/base/Makefile.in
View file

@ -39,7 +39,7 @@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
# docker.hub image. PLEASE CHANGE THIS IF YOU PUSH YOUR OWN # docker.hub image. PLEASE CHANGE THIS IF YOU PUSH YOUR OWN
IMG = olofhagsand/clixon # base image IMG = clixon/clixon # base image
SHELL = /bin/sh SHELL = /bin/sh
@ -53,6 +53,7 @@ clixon:
git clone file://$(realpath ${top_srcdir}) git clone file://$(realpath ${top_srcdir})
clean: clean:
rm -rf clixon # clone of top-srcdir
distclean: clean distclean: clean
rm -f Makefile *~ .depend rm -f Makefile *~ .depend
@ -61,7 +62,7 @@ docker: clixon Dockerfile
sudo docker build -t $(IMG) . # --no-cache sudo docker build -t $(IMG) . # --no-cache
push: push:
sudo docker push $(IMG)
depend: depend:
install-include: install-include:

2
docker/base/README.md
View file

@ -1,7 +1,7 @@
# Clixon base docker image # Clixon base docker image
This directory contains code for building and pushing the clixon base docker This directory contains code for building and pushing the clixon base docker
container. By default it is pushed to olofhagsand/clixon, but you can change 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. the IMAGE in Makefile.in and push it to another name.
The clixon docker base image can be used to build clixon The clixon docker base image can be used to build clixon