From 575f7b3bd0dac70a5e9522194442b768ec89c8b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20-=20Le=20Filament?= <theo@le-filament.com>
Date: Tue, 30 Jul 2024 17:57:17 +0200
Subject: [PATCH] fix: incorrect Odoo branch
---
10.0.Dockerfile | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/10.0.Dockerfile b/10.0.Dockerfile
index db9c1ff..9a132c6 100644
--- a/10.0.Dockerfile
+++ b/10.0.Dockerfile
@@ -1,14 +1,12 @@
FROM debian/eol:jessie
MAINTAINER Le Filament <https://le-filament.com>
-ARG SAVE_COMMITS_DIR='/opt/odoo_commits/'
ENV APT_DEPS='python-dev build-essential libxml2-dev libxslt1-dev libjpeg-dev libfreetype6-dev \
liblcms2-dev libopenjpeg-dev libtiff5-dev tk-dev tcl-dev linux-headers-amd64 \
libpq-dev libldap2-dev libsasl2-dev' \
LANG=C.UTF-8 \
LC_ALL=C.UTF-8 \
- PGDATABASE=odoo \
- SAVE_COMMITS_DIR=$SAVE_COMMITS_DIR
+ PGDATABASE=odoo
RUN set -x; \
sed -Ei 's@(^deb http://deb.debian.org/debian jessie-updates main$)@#\1@' /etc/apt/sources.list &&\
@@ -56,6 +54,9 @@ RUN set -x; \
apt-get -y autoremove &&\
rm -rf /var/lib/apt/lists/* wkhtmltox.deb
+ARG SAVE_COMMITS_DIR='/opt/odoo_commits/'
+ENV SAVE_COMMITS_DIR=$SAVE_COMMITS_DIR
+
# Add Git Known Hosts
COPY ./ssh_known_git_hosts /root/.ssh/known_hosts
@@ -63,10 +64,11 @@ COPY ./ssh_known_git_hosts /root/.ssh/known_hosts
ARG SAVE_COMMITS_FILENAME='ocb'
RUN set -x; \
repo='https://github.com/OCA/OCB' \
+ branch='10.0' \
&& 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}" \
&& mkdir /opt/odoo_commits \
- && git clone --single-branch --branch '16.0' --depth 1 "${repo}" /tmp/repo \
+ && git clone --single-branch --branch "${branch}" --depth 1 "${repo}" /tmp/repo \
&& commit="$(git -C /tmp/repo rev-parse HEAD)" \
&& mv /tmp/repo/* /opt/odoo/odoo/ \
&& echo "${repo};${commit}" > $SAVE_COMMITS_DIR/$SAVE_COMMITS_FILENAME \
--
GitLab