Merge branch 'dev' into 'master'

edit files

See merge request !1

Dockerfile

@@ -23,14 +23,14 @@ RUN chown odoo entrypoint.sh && chmod 777 entrypoint.sh
 
 #Setup odoo log directory
 RUN mkdir -p /var/log/odoo && chown -R odoo /var/log/odoo
-RUN mkdir -p /mnt/tai && chown -R odoo /mnt/tai
+RUN mkdir -p /mnt/extra-addons && chown -R odoo /mnt/extra-addons
 
 #Setup directory for odoo attachements
 RUN mkdir /home/odoo_filestore && chmod -R 777 /home/odoo_filestore
 
 VOLUME ["/var/log/odoo", "/home/odoo_filestore"]
 
-COPY  jta_interprise /mnt/jta_interprise
+COPY  addons/ /mnt/extra-addons 
 #COPY web_auth_signup /mnt/web_auth_signup
 #COPY web_portal /mnt/web_portal
 

entrypoint.sh

@@ -35,12 +35,12 @@ case "$1" in
             exec odoo "$@"
         else
             wait-for-psql.py ${DB_ARGS[@]} --timeout=30
-            exec odoo "$@" "${DB_ARGS[@]}" -d fongip -u all -c /etc/odoo/odoo.conf
+            exec odoo "$@" "${DB_ARGS[@]}" 
         fi
         ;;
     -*)
         wait-for-psql.py ${DB_ARGS[@]} --timeout=30
-        exec odoo "$@" "${DB_ARGS[@]}" -d fongip -u all -c /etc/odoo/odoo.conf 
+        exec odoo "$@" "${DB_ARGS[@]}" 
         ;;
     *)
         exec "$@"