Skip to content

Commit

Permalink
Merge pull request #630 from Tecnativa/geoip-version-handling
Browse files Browse the repository at this point in the history 
[ADD] GeoIP version handling to avoid warnings
  • Loading branch information
@josep-tecnativa
josep-tecnativa authored Oct 14, 2024
2 parents 5d7e011 + dc605f6 commit 0c5b619
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 3 deletions.
2 changes: 2 additions & 0 deletions 11.0.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ RUN ln -s /usr/local/lib/python3.5/site-packages/doodbalib \
COPY build.d common/build.d
COPY conf.d common/conf.d
COPY entrypoint.d common/entrypoint.d
RUN rm -f /opt/odoo/common/conf.d/60-geoip-ge17.conf \
&& mv /opt/odoo/common/conf.d/60-geoip-lt17.conf /opt/odoo/common/conf.d/60-geoip.conf
RUN mkdir -p auto/addons auto/geoip custom/src/private \
&& ln /usr/local/bin/direxec common/entrypoint \
&& ln /usr/local/bin/direxec common/build \
Expand Down
2 changes: 2 additions & 0 deletions 12.0.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ COPY lib/doodbalib /usr/local/lib/python3.5/site-packages/doodbalib
COPY build.d common/build.d
COPY conf.d common/conf.d
COPY entrypoint.d common/entrypoint.d
RUN rm -f /opt/odoo/common/conf.d/60-geoip-ge17.conf \
&& mv /opt/odoo/common/conf.d/60-geoip-lt17.conf /opt/odoo/common/conf.d/60-geoip.conf
RUN mkdir -p auto/addons auto/geoip custom/src/private \
&& ln /usr/local/bin/direxec common/entrypoint \
&& ln /usr/local/bin/direxec common/build \
Expand Down
2 changes: 2 additions & 0 deletions 13.0.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ COPY lib/doodbalib /usr/local/lib/python3.6/site-packages/doodbalib
COPY build.d common/build.d
COPY conf.d common/conf.d
COPY entrypoint.d common/entrypoint.d
RUN rm -f /opt/odoo/common/conf.d/60-geoip-ge17.conf \
&& mv /opt/odoo/common/conf.d/60-geoip-lt17.conf /opt/odoo/common/conf.d/60-geoip.conf
RUN mkdir -p auto/addons auto/geoip custom/src/private \
&& ln /usr/local/bin/direxec common/entrypoint \
&& ln /usr/local/bin/direxec common/build \
Expand Down
2 changes: 2 additions & 0 deletions 14.0.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ COPY lib/doodbalib /usr/local/lib/python3.8/site-packages/doodbalib
COPY build.d common/build.d
COPY conf.d common/conf.d
COPY entrypoint.d common/entrypoint.d
RUN rm -f /opt/odoo/common/conf.d/60-geoip-ge17.conf \
&& mv /opt/odoo/common/conf.d/60-geoip-lt17.conf /opt/odoo/common/conf.d/60-geoip.conf
RUN mkdir -p auto/addons auto/geoip custom/src/private \
&& ln /usr/local/bin/direxec common/entrypoint \
&& ln /usr/local/bin/direxec common/build \
Expand Down
2 changes: 2 additions & 0 deletions 15.0.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ COPY lib/doodbalib /usr/local/lib/python3.8/site-packages/doodbalib
COPY build.d common/build.d
COPY conf.d common/conf.d
COPY entrypoint.d common/entrypoint.d
RUN rm -f /opt/odoo/common/conf.d/60-geoip-ge17.conf \
&& mv /opt/odoo/common/conf.d/60-geoip-lt17.conf /opt/odoo/common/conf.d/60-geoip.conf
RUN mkdir -p auto/addons auto/geoip custom/src/private \
&& ln /usr/local/bin/direxec common/entrypoint \
&& ln /usr/local/bin/direxec common/build \
Expand Down
2 changes: 2 additions & 0 deletions 16.0.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ COPY lib/doodbalib /usr/local/lib/python3.10/site-packages/doodbalib
COPY build.d common/build.d
COPY conf.d common/conf.d
COPY entrypoint.d common/entrypoint.d
RUN rm -f /opt/odoo/common/conf.d/60-geoip-ge17.conf \
&& mv /opt/odoo/common/conf.d/60-geoip-lt17.conf /opt/odoo/common/conf.d/60-geoip.conf
RUN mkdir -p auto/addons auto/geoip custom/src/private \
&& ln /usr/local/bin/direxec common/entrypoint \
&& ln /usr/local/bin/direxec common/build \
Expand Down
2 changes: 2 additions & 0 deletions 17.0.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ COPY lib/doodbalib /usr/local/lib/python3.10/site-packages/doodbalib
COPY build.d common/build.d
COPY conf.d common/conf.d
COPY entrypoint.d common/entrypoint.d
RUN rm -f /opt/odoo/common/conf.d/60-geoip-lt17.conf \
&& mv /opt/odoo/common/conf.d/60-geoip-ge17.conf /opt/odoo/common/conf.d/60-geoip.conf
RUN mkdir -p auto/addons auto/geoip custom/src/private \
&& ln /usr/local/bin/direxec common/entrypoint \
&& ln /usr/local/bin/direxec common/build \
Expand Down
2 changes: 2 additions & 0 deletions 18.0.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ COPY lib/doodbalib /usr/local/lib/python3.10/site-packages/doodbalib
COPY build.d common/build.d
COPY conf.d common/conf.d
COPY entrypoint.d common/entrypoint.d
RUN rm -f /opt/odoo/common/conf.d/60-geoip-lt17.conf \
&& mv /opt/odoo/common/conf.d/60-geoip-ge17.conf /opt/odoo/common/conf.d/60-geoip.conf
RUN mkdir -p auto/addons auto/geoip custom/src/private \
&& ln /usr/local/bin/direxec common/entrypoint \
&& ln /usr/local/bin/direxec common/build \
Expand Down
3 changes: 0 additions & 3 deletions conf.d/60-geoip.conf → conf.d/60-geoip-ge17.conf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[options]
; Used before v17
geoip_database = /opt/odoo/auto/geoip/GeoLite2-City.mmdb
; Used in v17+
geoip_city_db = /opt/odoo/auto/geoip/GeoLite2-City.mmdb
geoip_country_db = /opt/odoo/auto/geoip/GeoLite2-Country.mmdb
2 changes: 2 additions & 0 deletions conf.d/60-geoip-lt17.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[options]
geoip_database = /opt/odoo/auto/geoip/GeoLite2-City.mmdb

0 comments on commit 0c5b619

Please sign in to comment.