Merge branch 'develop' of https://github.com/clicon/clixon into develop

This commit is contained in:
Olof hagsand 2018-11-04 19:47:33 +01:00
commit 5aad2e5383

View file

@ -6,7 +6,7 @@ the IMAGE in Makefile.in and push it to another name.
The clixon docker image is a base image that can be used to build The clixon docker image is a base image that can be used to build
clixon applications. It has all the whole code for a clixon release clixon applications. It has all the whole code for a clixon release
which it downloads from git - it does not use local code. which it downloads from git - it does not use local code (note it may even use develop branch).
See example/docker for how to build a docker application using the base image. See example/docker for how to build a docker application using the base image.
@ -16,4 +16,4 @@ Perform the build by 'make docker'.
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 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 run the container directly by going directly to example and You may run the container directly by going directly to example and
the docker runtime scripts there the docker runtime scripts there