diff --git a/Dockerfiles.d/Dockerfile.centos.base b/Dockerfiles.d/Dockerfile.centos.base index 8c070578e347e9fd1e5e98e5e2274988639150e6..53878561c75c06b6545a8c160c276b805311a00a 100644 --- a/Dockerfiles.d/Dockerfile.centos.base +++ b/Dockerfiles.d/Dockerfile.centos.base @@ -1,5 +1,5 @@ -#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.centos.base -t fodpy3_base . && docker build -f ./Dockerfiles.d/Dockerfile.centos.step2 -t fodpy3 . +#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.centos.base -t fodpy3_centos_base . && docker build -f ./Dockerfiles.d/Dockerfile.centos.step2 -t fodpy3_centos . ## diff --git a/Dockerfiles.d/Dockerfile.centos.step2 b/Dockerfiles.d/Dockerfile.centos.step2 index 78012ef8ed8eeebc0b91ed7b57132e1209a3502d..ae2e3b6a9ab82730b09b1202dbed6e0b1adce8fa 100644 --- a/Dockerfiles.d/Dockerfile.centos.step2 +++ b/Dockerfiles.d/Dockerfile.centos.step2 @@ -1,5 +1,5 @@ -#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.centos.base -t fodpy3_base . && docker build -f ./Dockerfiles.d/Dockerfile.centos.step2 -t fodpy3 . +#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.centos.base -t fodpy3_centos_base . && docker build -f ./Dockerfiles.d/Dockerfile.centos.step2 -t fodpy3_centos . ## diff --git a/Dockerfiles.d/Dockerfile.supervisord b/Dockerfiles.d/Dockerfile.centos.supervisord similarity index 100% rename from Dockerfiles.d/Dockerfile.supervisord rename to Dockerfiles.d/Dockerfile.centos.supervisord diff --git a/Dockerfiles.d/Dockerfile.centos.supervisord.base b/Dockerfiles.d/Dockerfile.centos.supervisord.base index 967446174bdf52440ecc29c367c438d739645c2a..b281cc520992e25a128b8b87b99b582f582e9bff 100644 --- a/Dockerfiles.d/Dockerfile.centos.supervisord.base +++ b/Dockerfiles.d/Dockerfile.centos.supervisord.base @@ -1,5 +1,5 @@ -#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.centos.supervisord.base -t fodpy3_base . && docker build -f ./Dockerfiles.d/Dockerfile.centos.supervisord.step2 -t fodpy3 . +#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.centos.supervisord.base -t fodpy3_centos_svzd_base . && docker build -f ./Dockerfiles.d/Dockerfile.centos.supervisord.step2 -t fodpy3_centos_svzd . ## diff --git a/Dockerfiles.d/Dockerfile.centos.supervisord.step2 b/Dockerfiles.d/Dockerfile.centos.supervisord.step2 index b1183d3d80ad4e1a7c446e096b2b4367272d3543..a776c16f5be3fae8502b7b60e5165a1002f95aa4 100644 --- a/Dockerfiles.d/Dockerfile.centos.supervisord.step2 +++ b/Dockerfiles.d/Dockerfile.centos.supervisord.step2 @@ -1,5 +1,5 @@ -#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.centos.supervisord.base -t fodpy3_base . && docker build -f ./Dockerfiles.d/Dockerfile.centos.supervisord.step2 -t fodpy3 . +#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.centos.supervisord.base -t fodpy3_centos_svzd_base . && docker build -f ./Dockerfiles.d/Dockerfile.centos.supervisord.step2 -t fodpy3_centos_svzd . ## diff --git a/Dockerfiles.d/Dockerfile.debian.base b/Dockerfiles.d/Dockerfile.debian.base index 7a7444285d948e40d0fadbf6859b5a2329e17dcc..778215cca0669918f995a2620dc1219874d2bbda 100644 --- a/Dockerfiles.d/Dockerfile.debian.base +++ b/Dockerfiles.d/Dockerfile.debian.base @@ -1,5 +1,5 @@ -#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.debian.base -t fodpy3_base . && docker build -f ./Dockerfiles.d/Dockerfile.debian.step2 -t fodpy3 . +#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.debian.base -t fodpy3_debian_base . && docker build -f ./Dockerfiles.d/Dockerfile.debian.step2 -t fodpy3_debian . ## diff --git a/Dockerfiles.d/Dockerfile.debian.step2 b/Dockerfiles.d/Dockerfile.debian.step2 index c925c5dd0ac375f3893f4b186704f1c2768b2e22..ed8c241648db744385e43195d9e7296fbc624aa2 100644 --- a/Dockerfiles.d/Dockerfile.debian.step2 +++ b/Dockerfiles.d/Dockerfile.debian.step2 @@ -1,5 +1,5 @@ -#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.debian.base -t fodpy3_base . && docker build -f ./Dockerfiles.d/Dockerfile.debian.step2 -t fodpy3 . +#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.debian.base -t fodpy3_debian_base . && docker build -f ./Dockerfiles.d/Dockerfile.debian.step2 -t fodpy3_debian . ## diff --git a/Dockerfiles.d/Dockerfile.debian.supervisord.base b/Dockerfiles.d/Dockerfile.debian.supervisord.base index ec4763fa99b69cec7332b1714ba0df748020ced2..49d21abb1edc72e4481580714d4a00c093028f2c 100644 --- a/Dockerfiles.d/Dockerfile.debian.supervisord.base +++ b/Dockerfiles.d/Dockerfile.debian.supervisord.base @@ -1,5 +1,5 @@ -#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.debian.supervisor.base -t fodpy3_base . && docker build -f ./Dockerfiles.d/Dockerfile.debian.supervisor.step2 -t fodpy3 . +#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.debian.supervisord.base -t fodpy3_debian_svzd_base . && docker build -f ./Dockerfiles.d/Dockerfile.debian.supervisord.step2 -t fodpy3_debian_svzd . ## diff --git a/Dockerfiles.d/Dockerfile.debian.supervisord.step2 b/Dockerfiles.d/Dockerfile.debian.supervisord.step2 index dac52e5c9ce79bd8f1157668a1b2a9e5d9c39b6a..1e45b38d1583e89bcfd7a7cb23f395e0606b19bc 100644 --- a/Dockerfiles.d/Dockerfile.debian.supervisord.step2 +++ b/Dockerfiles.d/Dockerfile.debian.supervisord.step2 @@ -1,5 +1,5 @@ -#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.debian.supervisor.base -t fodpy3_base . && docker build -f ./Dockerfiles.d/Dockerfile.debian.supervisor.step2 -t fodpy3 . +#use (from main dir): docker build -f ./Dockerfiles.d/Dockerfile.debian.supervisord.base -t fodpy3_debian_svzd_base . && docker build -f ./Dockerfiles.d/Dockerfile.debian.supervisord.step2 -t fodpy3_debian_svzd . ## diff --git a/doc/installation/v1.7/docker.md b/doc/installation/v1.7/docker.md index ed5b1206027e9c3b9d4b78665993499146942fb0..4f13188d71dc1e09006d7b8cde6cf5bddba9e3f8 100644 --- a/doc/installation/v1.7/docker.md +++ b/doc/installation/v1.7/docker.md @@ -34,19 +34,43 @@ gunicorn will be accessible from outside the container by port 8000. #### Installation and starting of CENTOS docker container +building docker container: +``` docker build -f Dockerfile -t fod-centos . - +or +docker build -f ./Dockerfiles.d/Dockerfile.centos.supervisord -t fod-centos . # for using supervisord inside container +or +docker build -f ./Dockerfiles.d/Dockerfile.centos.base -t fodpy3_centos_base . && docker build -f ./Dockerfiles.d/Dockerfile.centos.step2 -t fod-centos . # for using a 2-step docker build (for faster rebuild on changes in the code, mainly useful for developers) +or +docker build -f ./Dockerfiles.d/Dockerfile.centos.supervisord.base -t fodpy3_centos_svzd_base . && docker build -f ./Dockerfiles.d/Dockerfile.centos.supervisord.step2 -t fod-centos . # for using supervisord inside container + using a 2-step docker build (for faster rebuild on changes in the code, mainly useful for developers) +``` + +starting built docker container: +``` docker run -p 8000:8000 fod-centos # run in foregrund docker run -d -p 8000:8000 fod-centos # run in background +``` #### Installation and starting of UBUNTU docker container -docker build -f Dockerfile.debian -t fod-debian . - +building docker container: +``` +docker build -f ./Dockerfiles.d/Dockerfile.debian -t fod-debian . +or +docker build -f ./Dockerfiles.d/Dockerfile.debian.supervisord -t fod-debian . # for using supervisord inside container +or +docker build -f ./Dockerfiles.d/Dockerfile.debian.base -t fodpy3_debian_base . && docker build -f ./Dockerfiles.d/Dockerfile.debian.step2 -t fod-debian . # for using a 2-step docker build (for faster rebuild on changes in the code, mainly useful for developers) +or +docker build -f ./Dockerfiles.d/Dockerfile.debian.supervisord.base -t fodpy3_debian_svzd_base . && docker build -f ./Dockerfiles.d/Dockerfile.debian.supervisord.step2 -t fod-debian . # for using supervisord inside container + using a 2-step docker build (for faster rebuild on changes in the code, mainly useful for developers) +``` + +starting built docker container: +``` docker run -p 8000:8000 fod-debian # run in foreground docker run -d -p 8000:8000 fod-debian # run in background +``` #### Configuring NETCONF in a running container