fixed broken ./Dockerfiles.d/Dockerfile.debian.*

Dockerfiles.d/Dockerfile.centos.step2

@@ -3,6 +3,7 @@
 
 #FROM centos:7
 FROM fodpy3_base
+#dockerbase_dockerfile: ./Dockerfiles.d/Dockerfile.centos.base
 
 ENV LC_ALL en_US.utf8
 

Dockerfiles.d/Dockerfile.debian.step2

@@ -3,6 +3,7 @@
 
 #FROM debian:buster
 FROM fodpy3-debian_base
+#dockerbase_dockerfile: ./Dockerfiles.d/Dockerfile.seleniumcli.debian.base
 
 ENV LC_ALL en_US.utf8
 

Dockerfiles.d/Dockerfile.debian.supervisord.base

@@ -19,6 +19,8 @@ COPY install-debian.sh requirements.txt /srv/flowspy/
 
 RUN apt-get -qqy install patch
 
+RUN useradd -m fod
+
 #RUN (cd /srv/flowspy; ./install-debian.sh;)
 RUN (cd /srv/flowspy; ./install-debian.sh --basesw;)
 

Dockerfiles.d/Dockerfile.debian.supervisord.step2

@@ -3,7 +3,7 @@
 
 #FROM debian:buster
 FROM fodpy3-debian_base
-#dockerbase_dockerfile: Dockerfile.debian.supervisord.base
+#dockerbase_dockerfile: ./Dockerfiles.d/Dockerfile.debian.supervisord.base
 
 ENV LC_ALL en_US.utf8
 
@@ -16,6 +16,8 @@ RUN apt-get -qqy install locales
 RUN mkdir -p /var/log/fod /srv
 COPY . /srv/flowspy
 
+RUN id fod || useradd -m fod
+
 RUN apt-get -qqy install patch
 RUN (cd /srv/flowspy/flowspy && cp -f settings.py.dist settings.py && patch settings.py < settings.py.patch && touch settings_local.py;)
 

Dockerfiles.d/Dockerfile.seleniumcli.debian.step2

 #FROM debian:buster
 FROM seleniumcli.debian.base
-#dockerbase_dockerfile: Dockerfile.seleniumcli.debian.base
+#dockerbase_dockerfile: ./Dockerfiles.d/Dockerfile.seleniumcli.debian.base
 
 ENV LC_ALL en_US.utf8
 

Dockerfiles.d/Dockerfile.seleniumcli.ubuntu.step2

 #FROM debian:buster
 FROM seleniumcli.ubuntu.base
-#dockerbase_dockerfile: Dockerfile.seleniumcli.ubuntu.base
+#dockerbase_dockerfile: ./Dockerfiles.d/Dockerfile.seleniumcli.ubuntu.base
 
 ENV LC_ALL en_US.utf8
 

Dockerfiles.d/Dockerfile.supervisord

@@ -30,7 +30,7 @@ ENV LC_ALL en_US.utf8
 RUN mkdir -p /var/log/fod /srv
 COPY . /srv/flowspy
 
-RUN useradd -m fod
+RUN id fod || useradd -m fod
 #RUN chown -R fod: /srv/flowspy
 
 RUN (cd /srv/flowspy; ./install-centos.sh --fodproper;)

flowspy/settings.py.dist

@@ -182,6 +182,7 @@ TEMPLATES = [
             'context_processors': [
                 "django.contrib.auth.context_processors.auth",
                 'django_settings_export.settings_export',
+                'django.contrib.messages.context_processors.messages'
             ]
         },
     },

install-centos.sh

@@ -153,7 +153,8 @@ else
 		cd flowspy
 
 		if [ ! -e settings.py ]; then
-  		  cp -f settings.py.dist settings.py
+  		  #cp -f settings.py.dist settings.py
+  		  cp -f settings.py.centos.dist settings.py
 		  patch settings.py < settings.py.patch
 	        
 		  sed -i "s#/srv/flowspy#$fod_dir#" "settings.py"

install-debian.sh

@@ -77,7 +77,7 @@ if [ "$install_basesw" = 1 ]; then
 
   echo "Install dependencies"
   apt-get -qqy update
-  apt-get -qqy install python3-virtualenv python3-venv python3-setuptools \
+  apt-get -qqy install virtualenv python3-venv python3-setuptools \
     python3-dev vim git build-essential libevent-dev libxml2-dev libxslt1-dev \
     mariadb-server libmariadb-dev patch redis-server \
     rustc libssl-dev \
@@ -98,13 +98,16 @@ if [ "$install_fodproper" = 0 ]; then
     pyvenv "$venv_dir"
   else
     #virtualenv /srv/venv
-    virtualenv "$venv_dir"
+    virtualenv --python=python3 "$venv_dir"
   fi
   ln -sf "$venv_dir" "$fod_dir/venv"
 
   #source /srv/venv/bin/activate
   source "$venv_dir/bin/activate"
 
+  # fix
+  pip install setuptools==57.5.0
+
   pip install wheel
   pip install -r requirements.txt
 
@@ -118,7 +121,7 @@ else
     pyvenv "$venv_dir"
   else
     #virtualenv /srv/venv
-    virtualenv "$venv_dir"
+    virtualenv --python=python3 "$venv_dir"
   fi
   ln -sf "$venv_dir" "$fod_dir/venv"
   (

requirements.txt

-setuptools<58
+setuptools
 argparse
 cl
 celery==5.2.3