Merge branch 'new/14.0/dev_ide' into 14.0-test

# Conflicts:
#	Dockerfile
#	Dockerfile-GitLab

Dockerfile

@@ -1,5 +1,16 @@
 FROM hibou/hibou-odoo:14.0
 
+USER 0
+COPY --from=registry.gitlab.com/hibou-io/theia-python /opt/theia /opt/theia
+RUN set -x; \
+        curl -sL https://deb.nodesource.com/setup_12.x | bash - \
+        && apt-get install -y \
+           nodejs \
+           build-essential \
+           libsecret-1-0 \
+           procps \
+        && npm install --global yarn
+
 USER 104
 COPY --from=hibou/flow /flow /flow
 COPY --chown=104 entrypoint.sh /entrypoint.sh

Dockerfile-GitLab

@@ -1,5 +1,16 @@
 FROM registry.gitlab.com/hibou-io/hibou-odoo/odoo:RELEASE
 
+USER 0
+COPY --from=registry.gitlab.com/hibou-io/theia-python /opt/theia /opt/theia
+RUN set -x; \
+        curl -sL https://deb.nodesource.com/setup_12.x | bash - \
+        && apt-get install -y \
+           nodejs \
+           build-essential \
+           libsecret-1-0 \
+           procps \
+        && npm install --global yarn
+
 USER 104
 COPY --from=registry.gitlab.com/hibou-io/hibou-odoo/flow /flow /flow
 COPY --chown=104 entrypoint.sh /entrypoint.sh

entrypoint.sh

@@ -12,14 +12,24 @@ set -e
 #      Note that with Odoo running in the foreground, killing Odoo will kill the container.
 #    DEV_MODE=
 #      Unset to not use Theia at all.
+#    
+#    DEV_MODE_PATH=/opt/odoo/addons
+#      To change the path to start Theia in, useful to get git working.
+
+if [ "$DEV_MODE_PATH" == "" ]
+then
+   export DEV_MODE_PATH=/opt/odoo
+fi
 
 # setup development IDE
 if [ "$DEV_MODE" == "exclusive" ]
 then
-    exec node /opt/theia/src-gen/backend/main.js /opt/odoo --hostname=0.0.0.0
+    cd /opt/theia
+    exec node /opt/theia/src-gen/backend/main.js $DEV_MODE_PATH --hostname=0.0.0.0
 elif [ "$DEV_MODE" != "" ]
 then
-    node /opt/theia/src-gen/backend/main.js /opt/odoo --hostname=0.0.0.0 &
+    cd /opt/theia
+    node /opt/theia/src-gen/backend/main.js $DEV_MODE_PATH --hostname=0.0.0.0 &
 fi