diff --git a/compose/bots_complete/Dockerfile b/compose/bots_complete/Dockerfile index 42482b03..f164099d 100644 --- a/compose/bots_complete/Dockerfile +++ b/compose/bots_complete/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get install -y python RUN apt-get install -y python-dev RUN apt-get install -y python-distribute RUN apt-get install -y python-pip -RUN pip install --upgrade pip +# RUN pip install --upgrade pip # Copy requirements from source COPY ./etc /requirements @@ -20,10 +20,10 @@ RUN pip install -r /requirements/requirements.txt # Install additional/optional packages RUN pip install suds-jurko==0.6 -RUN pip install paramiko==2.0.2 RUN pip install pycrypto==2.6.1 RUN pip install supervisor==3.3.1 RUN pip install m3-cdecimal==2.3 +RUN pip install paramiko==1.15.2 # Copy complete source COPY . /bots @@ -52,7 +52,7 @@ COPY ./compose/bots_complete/supervisord.conf /etc/supervisor/supervisord.conf # Add Crontab file COPY ./compose/bots_complete/crontab /usr/local/lib/python2.7/dist-packages/bots/config/ -CMD [ /usr/local/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf" ] +CMD [ "/usr/local/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf" ] EXPOSE 8080 EXPOSE 9001 diff --git a/compose/bots_complete/README.md b/compose/bots_complete/README.md index 44d180fd..44f21b04 100644 --- a/compose/bots_complete/README.md +++ b/compose/bots_complete/README.md @@ -3,7 +3,7 @@ ## Introduction This dockerized version should provide a quick installable version of BOTS that runs "out of the box". -The file contains a dockerized version with all optional functionalities activiated in BOTS: +The file contains a dockerized version with all optional functionalities activated in BOTS: 1. Web-Server (default) 2. Directory Monitor @@ -18,11 +18,11 @@ In addition, following tools are used to control the environment: ## Docker Compose File The docker compose file stored at the root of this repo, may be used to create the instance of BOTS by issueing: - docker-composer -f complete.yaml up + docker-compose -f complete.yaml up Docker will then build BOTS based on Ubuntu 16:04 and Python 2.7. -Supervisor's http log-in can be passwort protected through environment variables, here defined as SUPERVUSER and SUPERVPASS. +Supervisor's http log-in can be password protected through environment variables, here defined as SUPERVUSER and SUPERVPASS. Port 8080 is used to provide BOTS Web interface Port 9001 is used for Supervisor HTTP interface diff --git a/compose/bots_complete/supervisord.conf b/compose/bots_complete/supervisord.conf index faaa01e6..2a1fedc6 100644 --- a/compose/bots_complete/supervisord.conf +++ b/compose/bots_complete/supervisord.conf @@ -33,4 +33,4 @@ password = %(ENV_SUPERVPASS)s [unix_http_server] file = /tmp/supervisor.sock -chmod = 0777 \ No newline at end of file +chmod = 0777 diff --git a/src/bots/config/settings.py b/src/bots/config/settings.py index eb4f5903..f588052f 100644 --- a/src/bots/config/settings.py +++ b/src/bots/config/settings.py @@ -46,13 +46,13 @@ #~ #PostgreSQL: DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'botsdb', - 'USER': 'bots', - 'PASSWORD': 'botsbots', - 'HOST': '127.0.0.1', - 'PORT': '5432', - 'OPTIONS': {}, + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(PROJECT_PATH, 'botssys/sqlitedb/botsdb'), + 'USER': '', #not needed for SQLite + 'PASSWORD': '', #not needed for SQLite + 'HOST': '', #not needed for SQLite + 'PORT': '', #not needed for SQLite + 'OPTIONS': {}, #not needed for SQLite } } diff --git a/src/bots/install/settings.py b/src/bots/install/settings.py index bdcd447e..8cf653b3 100644 --- a/src/bots/install/settings.py +++ b/src/bots/install/settings.py @@ -49,7 +49,7 @@ #~ 'NAME': 'botsdb', #~ 'USER': 'bots', #~ 'PASSWORD': 'botsbots', - #~ 'HOST': '127.0.0.1', + #~ 'HOST': 'db', #~ 'PORT': '5432', #~ 'OPTIONS': {}, #~ }