Install Node, but take Theia from a different docker image.

This commit is contained in:
Jared Kipe
2021-09-24 12:49:12 -07:00
parent 1e7a62dbe8
commit cda5d2d14b
3 changed files with 14 additions and 30 deletions

View File

@@ -1,8 +1,7 @@
FROM hibou/hibou-odoo:14.0
USER 0
WORKDIR /opt/theia
COPY dev.package.json ./package.json
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 \
@@ -11,18 +10,6 @@ RUN set -x; \
libsecret-1-0 \
procps \
&& npm install --global yarn
RUN yarn --pure-lockfile && \
NODE_OPTIONS="--max_old_space_size=4096" yarn theia build && \
yarn theia download:plugins && \
yarn --production && \
yarn autoclean --init && \
echo *.ts >> .yarnclean && \
echo *.ts.map >> .yarnclean && \
echo *.spec.* >> .yarnclean && \
yarn autoclean --force && \
yarn cache clean && \
chown -R 104:33 /opt/theia \
;
USER 104
COPY --from=hibou/flow /flow /flow

View File

@@ -1,8 +1,7 @@
FROM registry.gitlab.com/hibou-io/hibou-odoo/odoo:RELEASE
USER 0
WORKDIR /opt/theia
COPY dev.package.json ./package.json
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 \
@@ -11,18 +10,6 @@ RUN set -x; \
libsecret-1-0 \
procps \
&& npm install --global yarn
RUN yarn --pure-lockfile && \
NODE_OPTIONS="--max_old_space_size=4096" yarn theia build && \
yarn theia download:plugins && \
yarn --production && \
yarn autoclean --init && \
echo *.ts >> .yarnclean && \
echo *.ts.map >> .yarnclean && \
echo *.spec.* >> .yarnclean && \
yarn autoclean --force && \
yarn cache clean && \
chown -R 104:33 /opt/theia \
;
USER 104
COPY --from=registry.gitlab.com/hibou-io/hibou-odoo/flow /flow /flow

View File

@@ -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