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

update ./Dockerfiles.d/* base/2step

parent 1ea3ab32
Branches
No related tags found
No related merge requests found
......@@ -10,7 +10,7 @@ RUN yum -y install procps
RUN mkdir -p /var/log/fod /srv
#COPY . /srv/flowspy
COPY install-centos.sh requirements.txt /srv/flowspy/
COPY install-centos.sh requirements.txt requirements-centos.txt /srv/flowspy/
RUN (cd /srv/flowspy; ./install-centos.sh --basesw;)
......
......@@ -3,7 +3,8 @@
##
#docker_label: fodpy3_base
#docker_label_old: fodpy3_base
#docker_label: fodpy3_base_centos_svzd
#dockerbuild_sticky: 0
FROM centos:7
......@@ -16,7 +17,7 @@ RUN yum -y install procps
RUN mkdir -p /var/log/fod /srv
#COPY . /srv/flowspy
COPY install-centos.sh requirements.txt /srv/flowspy/
COPY install-centos.sh requirements.txt requirements-centos.txt /srv/flowspy/
RUN (cd /srv/flowspy; ./install-centos.sh --basesw;)
......
......@@ -9,8 +9,9 @@
#FROM centos:7
FROM fodpy3_base
#dockerbase_dockerfile: Dockerfile.centos.supervisord.base
#FROM fodpy3_base
FROM fodpy3_base_centos_svzd
#dockerbase_dockerfile: ./Dockerfiles.d/Dockerfile.centos.supervisord.base
##
......@@ -21,7 +22,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;)
......
......@@ -2,6 +2,7 @@
#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 .
FROM debian:buster
#docker_label: fodpy3-debian_base
ENV LC_ALL en_US.utf8
......
#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 .
#dockerbase_dockerfile: ./Dockerfiles.d/Dockerfile.debian.base
#FROM debian:buster
FROM fodpy3-debian_base
#dockerbase_dockerfile: ./Dockerfiles.d/Dockerfile.seleniumcli.debian.base
#docker_label_old: fodpy3_base-debian
#docker_label: fodpy3-debian
ENV LC_ALL en_US.utf8
......
#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 .
#docker_label: fodpy3_base-debian
#docker_label_old: fodpy3_base-debian
#docker_label: fodpy3-debian_svzd_base
FROM debian:buster
......@@ -19,7 +20,7 @@ COPY install-debian.sh requirements.txt /srv/flowspy/
RUN apt-get -qqy install patch
RUN useradd -m fod
RUN id fod || useradd -m fod
#RUN (cd /srv/flowspy; ./install-debian.sh;)
RUN (cd /srv/flowspy; ./install-debian.sh --basesw;)
......
......@@ -2,7 +2,7 @@
#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 .
#FROM debian:buster
FROM fodpy3-debian_base
FROM fodpy3-debian_svzd_base
#dockerbase_dockerfile: ./Dockerfiles.d/Dockerfile.debian.supervisord.base
ENV LC_ALL en_US.utf8
......
......@@ -98,6 +98,8 @@ fi
if [ "$install_fodproper" = 0 ]; then
set -e
echo "Setup partial python environment for FoD"
#virtualenv-3 /srv/venv
virtualenv-3 "$venv_dir"
......@@ -107,6 +109,8 @@ if [ "$install_fodproper" = 0 ]; then
#fix for broken anyjson and cl
pip install 'setuptools<58'
cp -f requirements-centos.txt requirements.txt
pip install -r requirements.txt
else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment