Basic api stuff and bot exec

services/Dockerfile-web

@@ -20,17 +20,18 @@ COPY ./services/web/supervisord.conf /etc/supervisor/supervisord.conf
 COPY ./services/web/supervisor_geeksbot.conf /etc/supervisor/conf.d/geeksbot.conf
 COPY ./ssl_certs/geeksbot_app/geeksbot_app_cert_chain.crt /etc/ssl/geeksbot_app_cert_chain.crt
 COPY ./ssl_certs/geeksbot_app/geeksbot.app.key /etc/ssl/geeksbot.app.key
+COPY ./.env /code/
 
 RUN rm -rf /tmp/*
 
 RUN mkdir -p /tmp/logs/nginx
 RUN mkdir -p /tmp/logs/geeksbot
 
-COPY manage.py .
-copy entrypoint .
-RUN sed -i 's/\r$//g' /code/entrypoint
-RUN chmod +x /code/entrypoint
+WORKDIR /code/geeksbot_v2
+
+# RUN sed -i 's/\r$//g' ./entrypoint
+# RUN chmod +x ./entrypoint
 
 EXPOSE 80 8000 443
 
-ENTRYPOINT [ "/code/entrypoint" ]
+ENTRYPOINT [ "./entrypoint" ]

services/web/geeksbot.conf

@@ -13,11 +13,11 @@ server {
     error_log /tmp/logs/geeksbot/error.log;
 
     location /static/ {
-        alias /code/staticfiles/;
+        alias /code/geeksbot_v2/staticfiles/;
     }
 
     location /error/ {
-        alias /code/staticfiles/errors/;
+        alias /code/geeksbot_v2/staticfiles/errors/;
     }
 
     location / {

services/web/supervisor_geeksbot.conf

@@ -1,6 +1,6 @@
 [program:geeksbot]
 command=/usr/local/bin/gunicorn config.wsgi:application -c /etc/gunicorn.conf
-directory=/code/
+directory=/code/geeksbot_v2
 stdout_logfile=/tmp/logs/geeksbot/gunicorn.log
 autostart=true
 autorestart=true