Merge pull request #624 from Tecnativa/fix-test-git-safe-fake-odoo

[FIX] Mark /tmp/fake-odoo as safe
Tecnativa · Sep 27, 2024 · 312a923 · 312a923
2 parents fc5b2c4 + 92b6174
commit 312a923
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/13.0.Dockerfile b/13.0.Dockerfile
@@ -56,7 +56,7 @@ RUN apt-get -qq update \
         telnet \
         vim \
         zlibc \
-    && echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' >> /etc/apt/sources.list.d/postgresql.list \
+    && echo 'deb https://apt-archive.postgresql.org/pub/repos/apt buster-pgdg main' >> /etc/apt/sources.list.d/postgresql.list \
     && curl -SL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
     && apt-get update \
     && apt-get install -yqq --no-install-recommends \

diff --git a/14.0.Dockerfile b/14.0.Dockerfile
@@ -72,7 +72,7 @@ RUN apt-get -qq update \
         telnet \
         vim \
         zlibc \
-    && echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' >> /etc/apt/sources.list.d/postgresql.list \
+    && echo 'deb https://apt-archive.postgresql.org/pub/repos/apt buster-pgdg main' >> /etc/apt/sources.list.d/postgresql.list \
     && curl -SL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
     && apt-get update \
     && curl --silent -L --output geoipupdate_${GEOIP_UPDATER_VERSION}_linux_${TARGETARCH}.deb https://github.com/maxmind/geoipupdate/releases/download/v${GEOIP_UPDATER_VERSION}/geoipupdate_${GEOIP_UPDATER_VERSION}_linux_${TARGETARCH}.deb \

diff --git a/tests/scaffoldings/repo_merge/custom/build.d/099-create-fake-odoo b/tests/scaffoldings/repo_merge/custom/build.d/099-create-fake-odoo
@@ -4,6 +4,7 @@ mkdir /tmp/fake-odoo
 cd /tmp/fake-odoo
 
 git init
+git config --system --add safe.directory /tmp/fake-odoo/.git
 touch odoo-bin
 git add odoo-bin
 git commit -m odoo-bin