Added docker support for three restconf modes: nginx/fcgi(default); evhtp ; and none.

This commit is contained in:
Olof hagsand 2020-07-07 13:26:38 +02:00
parent 5dc2a6387d
commit 5464eec540
15 changed files with 569 additions and 95 deletions

View file

@ -38,6 +38,12 @@ CC = @CC@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
with_restconf = @with_restconf@
ifdef with_restconf
DOCKERFILE = Dockerfile.$(with_restconf)
else
DOCKERFILE = Dockerfile
endif
# Example docker image. CHANGE THIS IF YOU PUSH
IMG = clixon/clixon-system
@ -59,16 +65,18 @@ clean:
distclean: clean
rm -f Makefile *~ .depend
docker: clixon Dockerfile
sudo docker build -t $(IMG) . # --no-cache
docker: clixon $(DOCKERFILE)
sudo docker build -f $(DOCKERFILE) -t $(IMG) . # --no-cache
push:
sudo docker push $(IMG)
# Start the clixon system container and run the test script
# sleep is for waiting for start script to run properly before starting tests
# Note tests will kill the daemons started in the start scrips
test: docker
./cleanup.sh ; PORT=8080 ./start.sh # kill (ignore error) and the start it
sudo docker exec -it clixon-system bash -c 'cd /usr/local/bin/test && ./all.sh'
sleep 1; sudo docker exec -it clixon-system bash -c 'cd /usr/local/bin/test && ./all.sh'
depend: