Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
O
odoo_docker
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Déploiement
Registre de conteneurs
Analyse
Données d'analyse des chaînes de valeur
Analyse des contributeurs
Données d'analyse du dépôt
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté GitLab
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
Le Filament
odoo_docker
Validations
7c946486
Valider
7c946486
rédigé
Il y a 1 an
par
Rémi - Le Filament
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
[ADD] version 17.0
parent
e2e3dfca
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Modifications
2
Pipelines
1
Afficher les modifications d'espaces
En ligne
Côte à côte
Affichage de
2 fichiers modifiés
.gitlab-ci.yml
+12
-0
12 ajouts, 0 suppression
.gitlab-ci.yml
17.0.Dockerfile
+146
-0
146 ajouts, 0 suppression
17.0.Dockerfile
avec
158 ajouts
et
0 suppression
.gitlab-ci.yml
+
12
−
0
Voir le fichier @
7c946486
...
@@ -80,3 +80,15 @@ docker-build-16.0:
...
@@ -80,3 +80,15 @@ docker-build-16.0:
# - docker push "$CI_REGISTRY_IMAGE:16.0-scratch"
# - docker push "$CI_REGISTRY_IMAGE:16.0-scratch"
# only:
# only:
# - '16.0'
# - '16.0'
docker-build-17.0
:
image
:
docker:24
stage
:
build
services
:
-
docker:24-dind
before_script
:
-
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script
:
-
docker build --pull -f 17.0.Dockerfile -t "$CI_REGISTRY_IMAGE:17.0" .
-
docker push "$CI_REGISTRY_IMAGE:17.0"
only
:
-
'
17.0'
Ce diff est replié.
Cliquez pour l'agrandir.
1
6
.0.Dockerfile
→
1
7
.0.Dockerfile
+
146
−
0
Voir le fichier @
7c946486
FROM
python:3.1
1
-slim-b
ullseye
AS
builder
FROM
python:3.1
2
-slim-b
ookworm
AS
builder
RUN
set
-x
;
\
RUN
set
-x
;
\
apt-get update
&&
\
apt-get update
&&
\
apt-get
install
-y
--no-install-recommends
build-essential libldap2-dev libpq-dev libsasl2-dev
&&
\
apt-get
install
-y
--no-install-recommends
build-essential libldap2-dev libpq-dev libsasl2-dev
&&
\
pip
install
wheel
&&
\
pip
install
wheel
&&
\
pip wheel
--wheel-dir
=
/svc/wheels
-r
https://raw.githubusercontent.com/oca/OCB/1
6
.0/requirements.txt
&&
\
pip wheel
--wheel-dir
=
/svc/wheels
-r
https://raw.githubusercontent.com/oca/OCB/1
7
.0/requirements.txt
&&
\
# astor required by base_view_inheritance_extension
# astor required by base_view_inheritance_extension
# openupgradelib required for OCA module migration from one version to another
# openupgradelib required for OCA module migration from one version to another
# phonenumbers required by phone_validation
# phonenumbers required by phone_validation
...
@@ -13,7 +13,7 @@ RUN set -x; \
...
@@ -13,7 +13,7 @@ RUN set -x; \
pip wheel --wheel-dir=/svc/wheels astor openupgradelib phonenumbers python-stdnum>=1.18 PyYAML zxcvbn
pip wheel --wheel-dir=/svc/wheels astor openupgradelib phonenumbers python-stdnum>=1.18 PyYAML zxcvbn
FROM
python:3.1
1
-slim-b
ullseye
AS
final
FROM
python:3.1
2
-slim-b
ookworm
AS
final
ENV
LANG=C.UTF-8 \
ENV
LANG=C.UTF-8 \
LC_ALL=C.UTF-8 \
LC_ALL=C.UTF-8 \
PGDATABASE=odoo
PGDATABASE=odoo
...
@@ -37,7 +37,7 @@ RUN set -x; \
...
@@ -37,7 +37,7 @@ RUN set -x; \
rm
-rf
/var/lib/apt/lists/
*
wkhtmltox.deb
rm
-rf
/var/lib/apt/lists/
*
wkhtmltox.deb
COPY
--from=builder /svc /svc
COPY
--from=builder /svc /svc
RUN
pip3
install
--no-index
--find-links
=
/svc/wheels
-r
https://raw.githubusercontent.com/oca/OCB/1
6
.0/requirements.txt
&&
\
RUN
pip3
install
--no-index
--find-links
=
/svc/wheels
-r
https://raw.githubusercontent.com/oca/OCB/1
7
.0/requirements.txt
&&
\
pip3
install
-U
--no-index
--find-links
=
/svc/wheels astor openupgradelib phonenumbers python-stdnum>
=
1.18 PyYAML zxcvbn
pip3
install
-U
--no-index
--find-links
=
/svc/wheels astor openupgradelib phonenumbers python-stdnum>
=
1.18 PyYAML zxcvbn
# Add Git Known Hosts
# Add Git Known Hosts
...
@@ -47,79 +47,79 @@ COPY ./ssh_known_git_hosts /root/.ssh/known_hosts
...
@@ -47,79 +47,79 @@ COPY ./ssh_known_git_hosts /root/.ssh/known_hosts
RUN
set
-x
;
\
RUN
set
-x
;
\
useradd
--create-home
--home-dir
/opt/odoo
--no-log-init
odoo
&&
\
useradd
--create-home
--home-dir
/opt/odoo
--no-log-init
odoo
&&
\
/bin/bash
-c
"mkdir -p /opt/odoo/{etc,odoo,additional_addons,private_addons,data,private}"
&&
\
/bin/bash
-c
"mkdir -p /opt/odoo/{etc,odoo,additional_addons,private_addons,data,private}"
&&
\
curl
-L
https://github.com/OCA/OCB/tarball/1
6
.0 |
tar
-xzC
/opt/odoo/odoo
--strip-components
1
&&
\
curl
-L
https://github.com/OCA/OCB/tarball/1
7
.0 |
tar
-xzC
/opt/odoo/odoo
--strip-components
1
&&
\
find /opt/odoo/odoo/addons/
*
/i18n/ /opt/odoo/odoo/odoo/addons/base/i18n/
-type
f
-not
-name
'fr.po'
-delete
&&
\
find /opt/odoo/odoo/addons/
*
/i18n/ /opt/odoo/odoo/odoo/addons/base/i18n/
-type
f
-not
-name
'fr.po'
-delete
&&
\
chown
-R
odoo:odoo /opt/odoo
chown
-R
odoo:odoo /opt/odoo
# Install Odoo OCA default dependencies - Commented modules do not exist yet
# Install Odoo OCA default dependencies - Commented modules do not exist yet
RUN
set
-x
;
\
#
RUN set -x; \
mkdir
-p
/tmp/oca-repos/
&&
\
#
mkdir -p /tmp/oca-repos/ &&\
curl
-L
https://github.com/OCA/account-financial-tools/tarball/1
6
.0 |
tar
-xzC
/tmp/oca-repos/
--one-top-level
=
"account-financial-tools"
--strip-components
1
&&
\
#
curl -L https://github.com/OCA/account-financial-tools/tarball/1
7
.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
\
#
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_move_name_sequence \
# /tmp/oca-repos/account-financial-tools/account_reconcile_show_boolean \
# /tmp/oca-repos/account-financial-tools/account_reconcile_show_boolean \
/tmp/oca-repos/account-financial-tools/account_usability
\
#
/tmp/oca-repos/account-financial-tools/account_usability \
/opt/odoo/additional_addons/
&&
\
#
/opt/odoo/additional_addons/ &&\
# https://github.com/OCA/account-invoicing/pull/1419
# https://github.com/OCA/account-invoicing/pull/1419
# curl -L https://github.com/OCA/account-invoicing/tarball/1
6
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="account-invoicing" --strip-components 1 &&\
# curl -L https://github.com/OCA/account-invoicing/tarball/1
7
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="account-invoicing" --strip-components 1 &&\
# mv /tmp/oca-repos/account-invoicing/sale_timesheet_invoice_description \
# mv /tmp/oca-repos/account-invoicing/sale_timesheet_invoice_description \
# /opt/odoo/additional_addons/ &&\
# /opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/account-reconcile/tarball/1
6
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="account-reconcile" --strip-components 1 &&\
#
curl -L https://github.com/OCA/account-reconcile/tarball/1
7
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="account-reconcile" --strip-components 1 &&\
mv /tmp/oca-repos/account-reconcile/account_statement_base \
#
mv /tmp/oca-repos/account-reconcile/account_statement_base \
/tmp/oca-repos/account-reconcile/account_reconcile_oca \
#
/tmp/oca-repos/account-reconcile/account_reconcile_oca \
/opt/odoo/additional_addons/ &&\
#
/opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/bank-statement-import/tarball/1
6
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="bank-statement-import" --strip-components 1 &&\
#
curl -L https://github.com/OCA/bank-statement-import/tarball/1
7
.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 \
#
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_file \
/tmp/oca-repos/bank-statement-import/account_statement_import_ofx \
#
/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/1
6
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="crm" --strip-components 1 &&\
# curl -L https://github.com/OCA/crm/tarball/1
7
.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/ &&\
# mv /tmp/oca-repos/crm/crm_stage_probability /opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/l10n-france/tarball/1
6
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="l10n-france" --strip-components 1 &&\
#
curl -L https://github.com/OCA/l10n-france/tarball/1
7
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="l10n-france" --strip-components 1 &&\
mv /tmp/oca-repos/l10n-france/l10n_fr_siret \
#
mv /tmp/oca-repos/l10n-france/l10n_fr_siret \
/tmp/oca-repos/l10n-france/l10n_fr_siret_lookup \
#
/tmp/oca-repos/l10n-france/l10n_fr_siret_lookup \
/opt/odoo/additional_addons/ &&\
#
/opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/partner-contact/tarball/1
6
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="partner-contact" --strip-components 1 &&\
#
curl -L https://github.com/OCA/partner-contact/tarball/1
7
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="partner-contact" --strip-components 1 &&\
mv /tmp/oca-repos/partner-contact/partner_disable_gravatar \
#
mv /tmp/oca-repos/partner-contact/partner_disable_gravatar \
/tmp/oca-repos/partner-contact/partner_firstname \
#
/tmp/oca-repos/partner-contact/partner_firstname \
/opt/odoo/additional_addons/ &&\
#
/opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/project/tarball/1
6
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="project" --strip-components 1 &&\
#
curl -L https://github.com/OCA/project/tarball/1
7
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="project" --strip-components 1 &&\
mv /tmp/oca-repos/project/project_task_default_stage \
#
mv /tmp/oca-repos/project/project_task_default_stage \
/tmp/oca-repos/project/project_template \
#
/tmp/oca-repos/project/project_template \
/opt/odoo/additional_addons/ &&\
#
/opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/server-auth/tarball/1
6
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-auth" --strip-components 1 &&\
#
curl -L https://github.com/OCA/server-auth/tarball/1
7
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-auth" --strip-components 1 &&\
mv /tmp/oca-repos/server-auth/password_security \
#
mv /tmp/oca-repos/server-auth/password_security \
/opt/odoo/additional_addons/ &&\
#
/opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/server-brand/tarball/1
6
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-brand" --strip-components 1 &&\
#
curl -L https://github.com/OCA/server-brand/tarball/1
7
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-brand" --strip-components 1 &&\
mv /tmp/oca-repos/server-brand/disable_odoo_online \
#
mv /tmp/oca-repos/server-brand/disable_odoo_online \
/tmp/oca-repos/server-brand/portal_odoo_debranding \
#
/tmp/oca-repos/server-brand/portal_odoo_debranding \
/tmp/oca-repos/server-brand/remove_odoo_enterprise \
#
/tmp/oca-repos/server-brand/remove_odoo_enterprise \
/opt/odoo/additional_addons/ &&\
#
/opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/server-tools/tarball/1
6
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-tools" --strip-components 1 &&\
#
curl -L https://github.com/OCA/server-tools/tarball/1
7
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-tools" --strip-components 1 &&\
mv /tmp/oca-repos/server-tools/base_view_inheritance_extension \
#
mv /tmp/oca-repos/server-tools/base_view_inheritance_extension \
/tmp/oca-repos/server-tools/module_change_auto_install \
#
/tmp/oca-repos/server-tools/module_change_auto_install \
/opt/odoo/additional_addons/ &&\
#
/opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/server-ux/tarball/1
6
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-ux" --strip-components 1 &&\
#
curl -L https://github.com/OCA/server-ux/tarball/1
7
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-ux" --strip-components 1 &&\
mv /tmp/oca-repos/server-ux/server_action_mass_edit \
#
mv /tmp/oca-repos/server-ux/server_action_mass_edit \
/opt/odoo/additional_addons/ &&\
#
/opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/social/tarball/1
6
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="social" --strip-components 1 &&\
#
curl -L https://github.com/OCA/social/tarball/1
7
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="social" --strip-components 1 &&\
mv /tmp/oca-repos/social/mail_debrand \
#
mv /tmp/oca-repos/social/mail_debrand \
/tmp/oca-repos/social/mail_tracking \
#
/tmp/oca-repos/social/mail_tracking \
/opt/odoo/additional_addons/ &&\
#
/opt/odoo/additional_addons/ &&\
curl -L https://github.com/OCA/web/tarball/1
6
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="web" --strip-components 1 &&\
#
curl -L https://github.com/OCA/web/tarball/1
7
.0 | tar -xzC /tmp/oca-repos/ --one-top-level="web" --strip-components 1 &&\
mv /tmp/oca-repos/web/web_chatter_position \
#
mv /tmp/oca-repos/web/web_chatter_position \
/tmp/oca-repos/web/web_environment_ribbon \
#
/tmp/oca-repos/web/web_environment_ribbon \
/tmp/oca-repos/web/web_refresher \
#
/tmp/oca-repos/web/web_refresher \
/tmp/oca-repos/web/web_responsive \
#
/tmp/oca-repos/web/web_responsive \
/tmp/oca-repos/web/web_no_bubble \
#
/tmp/oca-repos/web/web_no_bubble \
/tmp/oca-repos/web/web_theme_classic \
#
/tmp/oca-repos/web/web_theme_classic \
/opt/odoo/additional_addons/ &&\
#
/opt/odoo/additional_addons/ &&\
rm -rf /tmp/oca-repos/ &&\
#
rm -rf /tmp/oca-repos/ &&\
find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete &&\
#
find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete &&\
# Install Le Filament default dependency
#
# Install Le Filament default dependency
git clone -b 1
6
.0 --depth 1 https://sources.le-filament.com/lefilament/remove_login_links.git /opt/odoo/private_addons/remove_login_links &&\
#
git clone -b 1
7
.0 --depth 1 https://sources.le-filament.com/lefilament/remove_login_links.git /opt/odoo/private_addons/remove_login_links &&\
git clone -b 1
6
.0 --depth 1 https://sources.le-filament.com/lefilament/lefilament_release_agent.git /opt/odoo/private_addons/lefilament_release_agent &&\
#
git clone -b 1
7
.0 --depth 1 https://sources.le-filament.com/lefilament/lefilament_release_agent.git /opt/odoo/private_addons/lefilament_release_agent &&\
chown -R odoo:odoo /opt/odoo
#
chown -R odoo:odoo /opt/odoo
# Copy entrypoint script and Odoo configuration file
# Copy entrypoint script and Odoo configuration file
COPY
./entrypoint.sh /
COPY
./entrypoint.sh /
...
@@ -140,7 +140,7 @@ ENTRYPOINT ["/entrypoint.sh"]
...
@@ -140,7 +140,7 @@ ENTRYPOINT ["/entrypoint.sh"]
CMD
["odoo"]
CMD
["odoo"]
# Metadata
# Metadata
LABEL
org.label-schema.schema-version="1
6
.0" \
LABEL
org.label-schema.schema-version="1
7
.0" \
org.label-schema.vendor=LeFilament \
org.label-schema.vendor=LeFilament \
org.label-schema.license=Apache-2.0 \
org.label-schema.license=Apache-2.0 \
org.label-schema.vcs-url="https://sources.le-filament.com/lefilament/odoo_docker"
org.label-schema.vcs-url="https://sources.le-filament.com/lefilament/odoo_docker"
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter