audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Initial 16.0

Browse Source
This commit is contained in:
Jared Kipe
2022-10-01 09:56:07 -07:00
parent 9acd1bbed4
commit e4e8aae6ab
4 changed files with 22 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@@ -27,7 +27,7 @@ merge_request:
GIT_STRATEGY: none GIT_STRATEGY: none
stage: build stage: build
only: only:
- /(^new\/)|(^mig\/)|(^imp\/)|(^fix\/)/ - /(^add\/)|(^new\/)|(^mig\/)|(^imp\/)|(^fix\/)/i
script: script:
- docker pull registry.gitlab.com/hibou-io/hibou-odoo/flow - docker pull registry.gitlab.com/hibou-io/hibou-odoo/flow
- docker tag registry.gitlab.com/hibou-io/hibou-odoo/flow flow - docker tag registry.gitlab.com/hibou-io/hibou-odoo/flow flow
@@ -70,7 +70,7 @@ publish:
- ENVS=`env | grep "CI_\|GITLAB_" | sed -n '/^[^\t]/s/=.*//p' | sed '/^$/d' | sed 's/^/-e /g' | tr '\n' ' '` - ENVS=`env | grep "CI_\|GITLAB_" | sed -n '/^[^\t]/s/=.*//p' | sed '/^$/d' | sed 's/^/-e /g' | tr '\n' ' '`
- docker run -v $PWD:/src $ENVS flow odoo-publish -n "Hibou Odoo Suite" -v $RELEASE - docker run -v $PWD:/src $ENVS flow odoo-publish -n "Hibou Odoo Suite" -v $RELEASE
only: only:
- /^\d\d\.\d/ - /^\d\d\.\d+$/
trigger: trigger:
variables: variables:
@@ -79,5 +79,5 @@ trigger:
script: script:
- docker run byrnedo/alpine-curl curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=$RELEASE $GITLAB_BASE_URL/api/v4/projects/$ENTERPRISE_PROJECT_ID/trigger/pipeline - docker run byrnedo/alpine-curl curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=$RELEASE $GITLAB_BASE_URL/api/v4/projects/$ENTERPRISE_PROJECT_ID/trigger/pipeline
only: only:
- /^\d\d\.\d/ - /^\d\d\.\d+/

18
Dockerfile
View File

@@ -1,17 +1,7 @@
FROM hibou/hibou-odoo:15.0 FROM hibou/hibou-odoo:16.0
USER 0 USER odoo
COPY --from=registry.gitlab.com/hibou-io/theia-python /opt/theia /opt/theia COPY --from=registry.gitlab.com/hibou-io/athene /opt/athene /opt/athene
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 --from=hibou/flow /flow /flow
COPY --chown=104 entrypoint.sh /entrypoint.sh COPY --chown=104 entrypoint.sh /entrypoint.sh
COPY --chown=104 . /opt/odoo/hibou-suite COPY --chown=104 . /opt/odoo/hibou-suite
@@ -21,6 +11,6 @@ RUN rm /etc/odoo/odoo.conf \
EXPOSE 3000 EXPOSE 3000
ENV SHELL=/bin/bash \ ENV SHELL=/bin/bash \
THEIA_DEFAULT_PLUGINS=local-dir:/opt/theia/plugins THEIA_DEFAULT_PLUGINS=local-dir:/opt/athene/plugins
ENV USE_LOCAL_GIT true ENV USE_LOCAL_GIT true

16
Dockerfile-GitLab
View File

@@ -1,17 +1,7 @@
FROM registry.gitlab.com/hibou-io/hibou-odoo/odoo:RELEASE FROM registry.gitlab.com/hibou-io/hibou-odoo/odoo:RELEASE
USER 0 USER odoo
COPY --from=registry.gitlab.com/hibou-io/theia-python /opt/theia /opt/theia COPY --from=registry.gitlab.com/hibou-io/athene /opt/athene /opt/athene
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 --from=registry.gitlab.com/hibou-io/hibou-odoo/flow /flow /flow
COPY --chown=104 entrypoint.sh /entrypoint.sh COPY --chown=104 entrypoint.sh /entrypoint.sh
COPY --chown=104 . /opt/odoo/hibou-suite COPY --chown=104 . /opt/odoo/hibou-suite
@@ -21,6 +11,6 @@ RUN rm /etc/odoo/odoo.conf \
EXPOSE 3000 EXPOSE 3000
ENV SHELL=/bin/bash \ ENV SHELL=/bin/bash \
THEIA_DEFAULT_PLUGINS=local-dir:/opt/theia/plugins THEIA_DEFAULT_PLUGINS=local-dir:/opt/athene/plugins
ENV USE_LOCAL_GIT true ENV USE_LOCAL_GIT true

23
entrypoint.sh
View File

@@ -16,23 +16,24 @@ set -e
# DEV_MODE_PATH=/opt/odoo/addons # DEV_MODE_PATH=/opt/odoo/addons
# To change the path to start Theia in, useful to get git working. # To change the path to start Theia in, useful to get git working.
if [ "$DEV_MODE_PATH" != "" ] && [ -z "$(ls -A $DEV_MODE_PATH/.theia)" ]
then
cp -R /opt/odoo/hibou-suite/.theia $DEV_MODE_PATH || true
fi
if [ "$DEV_MODE_PATH" != "" ] && [ -z "$(ls -A $DEV_MODE_PATH/.pylintrc)" ]
then
cp -R /opt/odoo/hibou-suite/.pylintrc $DEV_MODE_PATH || true
fi
if [ "$DEV_MODE_PATH" == "" ] if [ "$DEV_MODE_PATH" == "" ]
then then
export DEV_MODE_PATH=/opt/odoo export DEV_MODE_PATH=/opt/odoo/hibou-suite
fi fi
if [[ -x "/opt/athene/entrypoint.sh" ]]
# setup development IDE
if [ "$DEV_MODE" == "exclusive" ]
then then
cd /opt/theia /opt/athene/entrypoint.sh
exec node /opt/theia/src-gen/backend/main.js $DEV_MODE_PATH --hostname=0.0.0.0
elif [ "$DEV_MODE" != "" ]
then
cd /opt/theia
node /opt/theia/src-gen/backend/main.js $DEV_MODE_PATH --hostname=0.0.0.0 &
fi fi
# set the postgres database host, port, user and password according to the environment # set the postgres database host, port, user and password according to the environment
# and pass them as arguments to the odoo process if not present in the config file # and pass them as arguments to the odoo process if not present in the config file
: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} : ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}