Skip to content
Snippets Groups Projects
Commit 00ff024b authored by David Schmitz's avatar David Schmitz
Browse files

providing updated Dockerfiles.fod.* in maindir; Dockerfile.fod.centos.new updated

parent 8d8b694e
No related branches found
No related tags found
No related merge requests found
...@@ -31,24 +31,26 @@ WORKDIR /srv/flowspy ...@@ -31,24 +31,26 @@ WORKDIR /srv/flowspy
############################### ###############################
# fod installation step1 # fod installation step1
COPY . /srv/flowspy #COPY . /srv/flowspy
RUN rm -rf /srv/flowspy/venv #RUN rm -rf /srv/flowspy/venv
COPY install-*.sh requirement*.txt /srv/flowspy/ COPY install-*.sh requirement*.txt* /srv/flowspy/
# only install system+python deps (for quicker rebuilding by exploiting the docker cache for this step1): # only install system+python deps (for quicker rebuilding by exploiting the docker cache for this step1):
#RUN ./install-centos.sh --basesw --here --systemd --systemd_only_install #RUN ./install-centos.sh --basesw --here --systemd --systemd_only_install
RUN bash ./install-centos.sh --basesw --here --supervisord RUN ./install-centos.sh --basesw --here --supervisord
############################### ###############################
# fod installation step2 # fod installation step2
RUN mv /srv/flowspy/venv /srv/flowspy/venv.saved
COPY . /srv/flowspy COPY . /srv/flowspy
#RUN rm -rf /srv/flowspy/venv RUN rm -rf /srv/flowspy/venv
RUN mv /srv/flowspy/venv.saved /srv/flowspy/venv
#RUN bash ./install-centos.sh --fodproper --here --supervisord --setup_admin_user --setup_admin_user5 admin adminpwd admin@localhost.local testpeer 0.0.0.0/0 --exabgp 10.3.10.3 10.3.10.3 1001 10.3.10.10 10.3.10.10 2001 #RUN ./install-centos.sh --fodproper --here --supervisord --setup_admin_user --setup_admin_user5 admin adminpwd admin@localhost.local testpeer 0.0.0.0/0 --exabgp 10.3.10.3 10.3.10.3 1001 10.3.10.10 10.3.10.10 2001
#RUN bash ./install-centos.sh --both --here --supervisord --setup_admin_user --setup_admin_user5 admin adminpwd admin@localhost.local testpeer 0.0.0.0/0 --exabgp 172.17.0.2 172.17.0.2 1001 172.17.0.3 172.17.0.3 3001 #RUN ./install-centos.sh --both --here --supervisord --setup_admin_user --setup_admin_user5 admin adminpwd admin@localhost.local testpeer 0.0.0.0/0 --exabgp 172.17.0.2 172.17.0.2 1001 172.17.0.3 172.17.0.3 3001
#RUN bash ./install-centos.sh --both --here --systemd --systemd_only_install --setup_admin_user --setup_admin_user5 admin adminpwd admin@localhost.local testpeer 0.0.0.0/0 # --exabgp 172.17.0.2 172.17.0.2 1001 172.17.0.3 172.17.0.3 3001 #RUN ./install-centos.sh --both --here --systemd --systemd_only_install --setup_admin_user --setup_admin_user5 admin adminpwd admin@localhost.local testpeer 0.0.0.0/0 # --exabgp 172.17.0.2 172.17.0.2 1001 172.17.0.3 172.17.0.3 3001
RUN ./install-centos.sh --fodproper --here --supervisord --setup_admin_user --setup_admin_user5 admin adminpwd admin@localhost.local testpeer 0.0.0.0/0 # --exabgp 172.17.0.2 172.17.0.2 1001 172.17.0.3 172.17.0.3 3001 RUN ./install-centos.sh --fodproper --here --supervisord --setup_admin_user --setup_admin_user5 admin adminpwd admin@localhost.local testpeer 0.0.0.0/0 # --exabgp 172.17.0.2 172.17.0.2 1001 172.17.0.3 172.17.0.3 3001
############################### ###############################
......
...@@ -33,7 +33,7 @@ WORKDIR /srv/flowspy ...@@ -33,7 +33,7 @@ WORKDIR /srv/flowspy
############################### ###############################
# fod installation step1 # fod installation step1
COPY install-*.sh requirement*.txt /srv/flowspy/ COPY install-*.sh requirement*.txt* /srv/flowspy/
# only install system+python deps (for quicker rebuilding by exploiting the docker cache for this step1): # only install system+python deps (for quicker rebuilding by exploiting the docker cache for this step1):
#RUN ./install-debian.sh --basesw --here --systemd --systemd_only_install #RUN ./install-debian.sh --basesw --here --systemd --systemd_only_install
...@@ -42,8 +42,10 @@ RUN ./install-debian.sh --basesw --here --supervisord ...@@ -42,8 +42,10 @@ RUN ./install-debian.sh --basesw --here --supervisord
############################### ###############################
# fod installation step2 # fod installation step2
RUN mv /srv/flowspy/venv /srv/flowspy/venv.saved
COPY . /srv/flowspy COPY . /srv/flowspy
RUN rm -rf /srv/flowspy/venv RUN rm -rf /srv/flowspy/venv
RUN mv /srv/flowspy/venv.saved /srv/flowspy/venv
# to be sure, try again to install newest deps, i.e., use --both instead of just --fodproper: # to be sure, try again to install newest deps, i.e., use --both instead of just --fodproper:
#RUN ./install-debian.sh --fodproper --here --supervisord --setup_admin_user --setup_admin_user5 admin adminpwd admin@localhost.local testpeer 0.0.0.0/0 --exabgp 10.3.10.3 10.3.10.3 1001 10.3.10.10 10.3.10.10 2001 #RUN ./install-debian.sh --fodproper --here --supervisord --setup_admin_user --setup_admin_user5 admin adminpwd admin@localhost.local testpeer 0.0.0.0/0 --exabgp 10.3.10.3 10.3.10.3 1001 10.3.10.10 10.3.10.10 2001
......
...@@ -192,6 +192,11 @@ fi ...@@ -192,6 +192,11 @@ fi
venv_dir_base="$(dirname "$venv_dir")" venv_dir_base="$(dirname "$venv_dir")"
echo "$0: venv_dir=$venv_dir => venv_dir_base=$venv_dir_base" 1>&2
ls -dla "$venv_dir" "$venv_dir_base" 1>&2
##
static_dir="$fod_dir/static" static_dir="$fod_dir/static"
inst_dir="$(dirname "$0")" inst_dir="$(dirname "$0")"
...@@ -305,7 +310,7 @@ if [ "$install_fodproper" = 0 ]; then ...@@ -305,7 +310,7 @@ if [ "$install_fodproper" = 0 ]; then
echo "Setup partial python environment for FoD" echo "Setup partial python environment for FoD"
(ls -la "$venv_dir" 1>&2 || true) (ls -dla "$venv_dir" 1>&2 || true)
if [ -x pyvenv ]; then if [ -x pyvenv ]; then
#pyvenv /srv/venv #pyvenv /srv/venv
pyvenv "$venv_dir" pyvenv "$venv_dir"
...@@ -314,6 +319,7 @@ if [ "$install_fodproper" = 0 ]; then ...@@ -314,6 +319,7 @@ if [ "$install_fodproper" = 0 ]; then
virtualenv-3 "$venv_dir" virtualenv-3 "$venv_dir"
fi fi
ln -sf "$venv_dir" "$fod_dir/venv" ln -sf "$venv_dir" "$fod_dir/venv"
ls -dla "$venv_dir" "$fod_dir/venv" 1>&2
#source /srv/venv/bin/activate #source /srv/venv/bin/activate
source "$venv_dir/bin/activate" source "$venv_dir/bin/activate"
...@@ -364,6 +370,7 @@ else ...@@ -364,6 +370,7 @@ else
echo "Setup python environment for FoD" echo "Setup python environment for FoD"
(ls -dla "$venv_dir" "$fod_dir/venv" "$venv_dir_base" 1>&2 || false)
if [ -x pyvenv ]; then if [ -x pyvenv ]; then
#pyvenv /srv/venv #pyvenv /srv/venv
pyvenv "$venv_dir" pyvenv "$venv_dir"
...@@ -372,6 +379,7 @@ else ...@@ -372,6 +379,7 @@ else
virtualenv-3 "$venv_dir" virtualenv-3 "$venv_dir"
fi fi
ln -sf "$venv_dir" "$fod_dir/venv" ln -sf "$venv_dir" "$fod_dir/venv"
ls -dla "$venv_dir" "$fod_dir/venv" 1>&2
( (
set +e set +e
......
...@@ -38,4 +38,3 @@ redis ...@@ -38,4 +38,3 @@ redis
pytest==6.2.5 pytest==6.2.5
pytest-django==4.4.0 pytest-django==4.4.0
intervaltree intervaltree
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment