From 12f9d59c056ac4d776f74f5e380cd645623a95ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20-=20Le=20Filament?= <theo@le-filament.com>
Date: Mon, 12 Aug 2024 13:57:49 +0200
Subject: [PATCH] change(build): define ENV related to commit hashes later in
image build
---
14.0.Dockerfile | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/14.0.Dockerfile b/14.0.Dockerfile
index 44959ed..41d432f 100644
--- a/14.0.Dockerfile
+++ b/14.0.Dockerfile
@@ -1,12 +1,10 @@
FROM python:3.9-slim-buster
MAINTAINER Le Filament <https://le-filament.com>
-ARG SAVE_COMMITS_DIR='/opt/odoo_commits/'
ENV APT_DEPS='build-essential libldap2-dev libpq-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; \
apt-get update &&\
@@ -31,6 +29,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
@@ -38,10 +39,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='14.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 '14.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