Skip to content
Extraits de code Groupes Projets
Valider 788d17e4 rédigé par Rémi - Le Filament's avatar Rémi - Le Filament
Parcourir les fichiers

[UPD] add existing OCA modules

parent 8d8e33a9
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Tout étendre Afficher les modifications d'espaces
En ligne Côte à côte
.gitlab-ci.yml
+ 13
− 13
Voir le fichier @ 788d17e4
......@@ -5,7 +5,7 @@
# Container Scanning customization: https://docs.gitlab.com/ee/user/application_security/container_scanning/#customizing-the-container-scanning-settings
# Note that environment variables can be set in several places
# See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
image: docker:24
image: docker:26
include:
- template: Security/Container-Scanning.gitlab-ci.yml
- template: Security/Secret-Detection.gitlab-ci.yml
......@@ -15,10 +15,10 @@ container_scanning:
CS_DOCKERFILE_PATH: "$CI_COMMIT_BRANCH.Dockerfile"
GIT_STRATEGY: fetch
docker-build-10.0:
image: docker:24
image: docker:26
stage: build
services:
- docker:24-dind
- docker:26-dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
......@@ -27,10 +27,10 @@ docker-build-10.0:
only:
- '10.0'
docker-build-12.0:
image: docker:24
image: docker:26
stage: build
services:
- docker:24-dind
- docker:26-dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
......@@ -44,10 +44,10 @@ docker-build-12.0:
only:
- '12.0'
docker-build-14.0:
image: docker:24
image: docker:26
stage: build
services:
- docker:24-dind
- docker:26-dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
......@@ -56,10 +56,10 @@ docker-build-14.0:
only:
- '14.0'
docker-build-16.0:
image: docker:24
image: docker:26
stage: build
services:
- docker:24-dind
- docker:26-dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
......@@ -68,10 +68,10 @@ docker-build-16.0:
only:
- '16.0'
# docker-build-16.0-scratch:
# image: docker:24
# image: docker:26
# stage: build
# services:
# - docker:24-dind
# - docker:26-dind
# before_script:
# - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
# script:
......@@ -81,10 +81,10 @@ docker-build-16.0:
# only:
# - '16.0'
docker-build-17.0:
image: docker:24
image: docker:26
stage: build
services:
- docker:24-dind
- docker:26-dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
......
17.0.Dockerfile
+ 39
− 39
Voir le fichier @ 788d17e4
......@@ -47,37 +47,37 @@ RUN set -x; \
chown -R odoo:odoo /opt/odoo
# Install Odoo OCA default dependencies - Commented modules do not exist yet
# RUN set -x; \
# mkdir -p /tmp/oca-repos/ &&\
# curl -L https://github.com/OCA/account-financial-tools/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="account-financial-tools" --strip-components 1 &&\
# mv /tmp/oca-repos/account-financial-tools/account_lock_date_update \
# /tmp/oca-repos/account-financial-tools/account_move_name_sequence \
RUN set -x; \
mkdir -p /tmp/oca-repos/ &&\
curl -L https://github.com/OCA/account-financial-tools/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="account-financial-tools" --strip-components 1 &&\
mv /tmp/oca-repos/account-financial-tools/account_lock_date_update \
/tmp/oca-repos/account-financial-tools/account_move_name_sequence \
# /tmp/oca-repos/account-financial-tools/account_reconcile_show_boolean \
# /tmp/oca-repos/account-financial-tools/account_usability \
# /opt/odoo/additional_addons/ &&\
# https://github.com/OCA/account-invoicing/pull/1419
/tmp/oca-repos/account-financial-tools/account_usability \
/opt/odoo/additional_addons/ &&\
## https://github.com/OCA/account-invoicing/pull/1713
# curl -L https://github.com/OCA/account-invoicing/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="account-invoicing" --strip-components 1 &&\
# mv /tmp/oca-repos/account-invoicing/sale_timesheet_invoice_description \
# /opt/odoo/additional_addons/ &&\
# curl -L https://github.com/OCA/account-reconcile/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="account-reconcile" --strip-components 1 &&\
# mv /tmp/oca-repos/account-reconcile/account_statement_base \
# /tmp/oca-repos/account-reconcile/account_reconcile_oca \
# /opt/odoo/additional_addons/ &&\
# curl -L https://github.com/OCA/bank-statement-import/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="bank-statement-import" --strip-components 1 &&\
# mv /tmp/oca-repos/bank-statement-import/account_statement_import_base \
curl -L https://github.com/OCA/account-reconcile/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="account-reconcile" --strip-components 1 &&\
mv /tmp/oca-repos/account-reconcile/account_statement_base \
/tmp/oca-repos/account-reconcile/account_reconcile_oca \
/opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/bank-statement-import/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="bank-statement-import" --strip-components 1 &&\
mv /tmp/oca-repos/bank-statement-import/account_statement_import_base \
# /tmp/oca-repos/bank-statement-import/account_statement_import_file \
# /tmp/oca-repos/bank-statement-import/account_statement_import_ofx \
# /opt/odoo/additional_addons/ &&\
/opt/odoo/additional_addons/ &&\
# curl -L https://github.com/OCA/crm/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="crm" --strip-components 1 &&\
# mv /tmp/oca-repos/crm/crm_stage_probability /opt/odoo/additional_addons/ &&\
# curl -L https://github.com/OCA/l10n-france/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="l10n-france" --strip-components 1 &&\
# mv /tmp/oca-repos/l10n-france/l10n_fr_siret \
curl -L https://github.com/OCA/l10n-france/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="l10n-france" --strip-components 1 &&\
mv /tmp/oca-repos/l10n-france/l10n_fr_siret \
# /tmp/oca-repos/l10n-france/l10n_fr_siret_lookup \
# /opt/odoo/additional_addons/ &&\
# curl -L https://github.com/OCA/partner-contact/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="partner-contact" --strip-components 1 &&\
/opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/partner-contact/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="partner-contact" --strip-components 1 &&\
# mv /tmp/oca-repos/partner-contact/partner_disable_gravatar \
# /tmp/oca-repos/partner-contact/partner_firstname \
# /opt/odoo/additional_addons/ &&\
mv /tmp/oca-repos/partner-contact/partner_firstname \
/opt/odoo/additional_addons/ &&\
# curl -L https://github.com/OCA/project/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="project" --strip-components 1 &&\
# mv /tmp/oca-repos/project/project_task_default_stage \
# /tmp/oca-repos/project/project_template \
......@@ -90,27 +90,27 @@ RUN set -x; \
# /tmp/oca-repos/server-brand/portal_odoo_debranding \
# /tmp/oca-repos/server-brand/remove_odoo_enterprise \
# /opt/odoo/additional_addons/ &&\
# curl -L https://github.com/OCA/server-tools/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-tools" --strip-components 1 &&\
# mv /tmp/oca-repos/server-tools/base_view_inheritance_extension \
# /tmp/oca-repos/server-tools/module_change_auto_install \
# /opt/odoo/additional_addons/ &&\
# curl -L https://github.com/OCA/server-ux/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-ux" --strip-components 1 &&\
# mv /tmp/oca-repos/server-ux/server_action_mass_edit \
# /opt/odoo/additional_addons/ &&\
# curl -L https://github.com/OCA/social/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="social" --strip-components 1 &&\
# mv /tmp/oca-repos/social/mail_debrand \
curl -L https://github.com/OCA/server-tools/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-tools" --strip-components 1 &&\
mv /tmp/oca-repos/server-tools/base_view_inheritance_extension \
/tmp/oca-repos/server-tools/module_change_auto_install \
/opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/server-ux/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-ux" --strip-components 1 &&\
mv /tmp/oca-repos/server-ux/server_action_mass_edit \
/opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/social/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="social" --strip-components 1 &&\
mv /tmp/oca-repos/social/mail_debrand \
# /tmp/oca-repos/social/mail_tracking \
# /opt/odoo/additional_addons/ &&\
# curl -L https://github.com/OCA/web/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="web" --strip-components 1 &&\
/opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/web/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="web" --strip-components 1 &&\
# mv /tmp/oca-repos/web/web_chatter_position \
# /tmp/oca-repos/web/web_environment_ribbon \
# /tmp/oca-repos/web/web_refresher \
# /tmp/oca-repos/web/web_responsive \
# /tmp/oca-repos/web/web_no_bubble \
mv /tmp/oca-repos/web/web_environment_ribbon \
/tmp/oca-repos/web/web_refresher \
/tmp/oca-repos/web/web_responsive \
/tmp/oca-repos/web/web_no_bubble \
# /tmp/oca-repos/web/web_theme_classic \
# /opt/odoo/additional_addons/ &&\
# rm -rf /tmp/oca-repos/ &&\
# find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete &&\
/opt/odoo/additional_addons/ &&\
rm -rf /tmp/oca-repos/ &&\
find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete &&\
# # Install Le Filament default dependency
# git clone -b 17.0 --depth 1 https://sources.le-filament.com/lefilament/remove_login_links.git /opt/odoo/private_addons/remove_login_links &&\
# git clone -b 17.0 --depth 1 https://sources.le-filament.com/lefilament/lefilament_release_agent.git /opt/odoo/private_addons/lefilament_release_agent &&\
......
entrypoint-scratch.sh supprimé 100755 → 0
+ 0
− 87
Voir le fichier @ 8d8e33a9
#!/bin/sh
# 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
: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
check_config() {
param="$1"
value="$2"
if ! grep -q -E "^\s*\b${param}\b\s*=" /opt/odoo/etc/odoo.conf ; then
DB_ARGS="${DB_ARGS} --${param} ${value}"
fi;
}
unaccent_db() {
/usr/bin/python3 -c "import psycopg2
try:
conn = psycopg2.connect(database='postgres', user='${USER}', password='${PASSWORD}', host='${HOST}', port='${PORT}')
except:
print('err: init: fail to connect to database')
exit(11)
cur = conn.cursor()
try:
cur.execute(\"SELECT datname FROM pg_database WHERE datname='${PGDATABASE}'\")
except:
print('err: init: fail to execute request')
cur.close()
conn.close()
exit(12)
if not cur.fetchall():
cur.close()
conn.close()
exit(1)
try:
cur.execute('CREATE EXTENSION IF NOT EXISTS unaccent')
except:
print('err: init: fail to execute request')
cur.close()
conn.close()
exit(13)
conn.commit()
cur.close()
conn.close()
exit(0)"
return $?
}
DB_ARGS=''
check_config "db_host" "$HOST"
check_config "db_port" "$PORT"
check_config "db_user" "$USER"
check_config "db_password" "$PASSWORD"
unaccent_db
return_code=$?
[ "$return_code" -gt 10 ] && exit 1
if [ "$return_code" == 1 ]; then
echo "info: init: database $PGDATABASE does not exist"
DB_ARGS="${DB_ARGS} --load-language fr_FR"
fi
case "$1" in
-- | odoo)
shift
if [[ "$1" == "scaffold" ]] ; then
exec /opt/odoo/odoo/odoo-bin -c /opt/odoo/etc/odoo.conf "$@"
else
exec /opt/odoo/odoo/odoo-bin -c /opt/odoo/etc/odoo.conf "$@" ${DB_ARGS}
fi
;;
-*)
exec /opt/odoo/odoo/odoo-bin -c /opt/odoo/etc/odoo.conf "$@" ${DB_ARGS}
;;
*)
exec "$@"
esac
exit 1
security_analysis16.txt supprimé 100644 → 0
+ 0
− 522
Voir le fichier @ 8d8e33a9
Ce diff est replié.
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter