From 28da545d80dbf2d69d875b53a4d8cf302cb8d54e Mon Sep 17 00:00:00 2001
From: David Schmitz <schmitz@lrz.de>
Date: Thu, 25 Aug 2022 12:41:25 +0000
Subject: [PATCH] Dockerfiles: fixed inline docu of 2-step docker builds to
reflect renamed file names; updated docu of FoD Dockerfile installation
---
Dockerfiles.d/Dockerfile.centos.base | 2 +-
Dockerfiles.d/Dockerfile.centos.step2 | 2 +-
...ervisord => Dockerfile.centos.supervisord} | 0
.../Dockerfile.centos.supervisord.base | 2 +-
.../Dockerfile.centos.supervisord.step2 | 2 +-
Dockerfiles.d/Dockerfile.debian.base | 2 +-
Dockerfiles.d/Dockerfile.debian.step2 | 2 +-
.../Dockerfile.debian.supervisord.base | 2 +-
.../Dockerfile.debian.supervisord.step2 | 2 +-
doc/installation/v1.7/docker.md | 30 +++++++++++++++++--
10 files changed, 35 insertions(+), 11 deletions(-)
rename Dockerfiles.d/{Dockerfile.supervisord => Dockerfile.centos.supervisord} (100%)
diff --git a/Dockerfiles.d/Dockerfile.centos.base b/Dockerfiles.d/Dockerfile.centos.base
index 8c070578..53878561 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 78012ef8..ae2e3b6a 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 96744617..b281cc52 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 b1183d3d..a776c16f 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 7a744428..778215cc 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 c925c5dd..ed8c2416 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 ec4763fa..49d21abb 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 dac52e5c..1e45b38d 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 ed5b1206..4f13188d 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
--
GitLab