Merge branch 'openfoodfacts:main' into main

.dockerignore

@@ -7,6 +7,11 @@ logs
 debug/
 perl-language-server.log
 
+openfoodfacts-mongodbdump.tar.gz
+openfoodfacts-products.jsonl.gz
+en.openfoodfacts.org.products.csv
+en.openfoodfacts.org.products.csv.gz
+
 html/images/misc/openfoodfacts-visual-decision-05-03-13.pdf
 html/images/misc/20130416_QUOz.pdf
 html/images/misc/assemblee-constitutive-off-v1.pdf

.github/labeler.yml

@@ -57,6 +57,11 @@ Stores:
 - taxonomies/states.result.sto
 - taxonomies/states.result.txt
 
+status system:
+- taxonomies/states.result.sto
+- taxonomies/states.result.txt
+- taxonomies/states.txt
+
 WikiData:
 - scripts/build_countries_taxonomy_from_wikidata.pl
 - scripts/build_languages_taxonomy_from_wikidata.pl
@@ -193,6 +198,7 @@ Footer:
 
 🐋 Docker:
 - docker/**/*
+- .dockerignore
 
 🏷️ Folksonomy Project:
 - html/js/folksonomy.js
@@ -253,6 +259,7 @@ Food.pm:
 Food groups:
 - lib/ProductOpener/FoodGroups.pm
 - tests/unit/food_groups.t
+- taxonomies/food_groups.txt
 
 🧪 Additives:
 - taxonomies/additives.txt
@@ -314,6 +321,7 @@ Ingredients analysis:
 
 Labels:
 - taxonomies/labels.txt
+- taxonomies/unused/labels_categories.txt
 
 Categories:
 - taxonomies/categories.txt
@@ -621,6 +629,7 @@ Blocks:
 
 🗺️ Made Near Me:
 - scripts/generate_madenearme_page.pl
+- scripts/generate_madenearme_pages.sh
 
 PAO:
 - scripts/generate_pao_taxonomy.pl
@@ -657,6 +666,7 @@ Config:
 
 Ingredients processing:
 - tests/unit/ingredients_processing.t
+- taxonomies/ingredients_processing.txt
 
 👥 Users:
 - lib/ProductOpener/Users.pm
@@ -798,6 +808,9 @@ Averages by categories:
 Static content:
 - scripts/copy_text_files.pl
 
+matomo:
+- scripts/utils/logs/download_matomo_logs.pl
+
 # TODO: find or create proper labels for those
 #- scripts/extract_images.pl
 #- scripts/test_text_fuzzy.pl

.github/workflows/auto-assign-pr.yml

@@ -17,4 +17,4 @@ jobs:
     name: 'Pull request assignment'
     runs-on: ubuntu-latest
     steps:
-      - uses: toshimaru/auto-author-assign@v2.0.1
+      - uses: toshimaru/auto-author-assign@v2.1.0

.github/workflows/crowdin-per-language.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Matrix
-      uses: crowdin/github-action@v1.16.0
+      uses: crowdin/github-action@v1.16.1
       with:
          upload_translations: false # default is false
          download_translations: true

.github/workflows/crowdin.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: crowdin action
-      uses: crowdin/github-action@v1.16.0
+      uses: crowdin/github-action@v1.16.1
       with:
         upload_translations: false # default is false
         # Use this option to upload translations for a single specified language

Makefile

@@ -112,9 +112,10 @@ create_folders:
 # Docker Compose #
 #----------------#
 
+# args variable may be use to eg. "--progress plain" option and keep logs on a failing build
 build:
 	@echo "🥫 Building containers …"
-	${DOCKER_COMPOSE} build ${container} 2>&1
+	${DOCKER_COMPOSE} build ${args} ${container} 2>&1
 
 _up:
 	@echo "🥫 Starting containers …"

conf/systemd/sync_images_s3@.service

@@ -0,0 +1,13 @@
+# service instance name "%i" is off only (for now)
+[Unit]
+Description=Synchronize images to AWS S3 %i
+# __ will be replaced by @ in email-failures@.service
+OnFailure=email-failures@sync_images_s3__%i.service
+
+[Service]
+Type=oneshot
+User=off
+Group=off
+WorkingDirectory=/srv/%i/scripts/sync-s3-images
+ExecStart=.venv/bin/python3 sync_s3_images.py /mnt/%i/images/products
+KillMode=process

conf/systemd/sync_images_s3@.timer

@@ -0,0 +1,12 @@
+# service instance name "%i" is off only (for now)
+[Unit]
+Description=Synchronize images to AWS S3 daily
+
+[Timer]
+# every tuesday
+OnCalendar=Tue *-*-* 02:00:00
+# service instance name "%i" is off / obf / opff / opf
+Unit=sync_images_s3@%i.service
+
+[Install]
+WantedBy=multi-user.target

docker/README.md

@@ -21,7 +21,8 @@ See also [targets to run tests](../docs/dev/how-to-write-and-run-tests.md#runnin
 
 | Command                   | Description                                                                            | Notes                                                         |
 | ------------------------- | -------------------------------------------------------------------------------------- | ------------------------------------------------------------- |
-| `make dev`                | Setup a fresh dev environment.                                                        | Run only once, then use the `up`, `down`, `restart` commands. |
+| `make dev`                | Setup a fresh dev environment.                                                         | Run only once, then use the `up`, `down`, `restart` commands. |
+| `make build`              | build containers. Add `container=name` to build a specific container                   | args="--progress log" keeps all log in console (to debug failing build) |
 | `make up`                 | Start containers.                                                                      |                                                               |
 | `make down`               | Stop containers and keep the volumes.                                                  | Products and users data will be kept.                         |
 | `make hdown`              | Stop containers and delete the volumes (hard down).                                    | Products and users data will be lost !                        |

docker/dev.yml

@@ -37,7 +37,6 @@ x-minion-db-network: &minion-db-network
 services:
   postgres:
     # only turn on for off profile
-    profiles: ["off"]
     <<: *minion-db-network
   backend:
     <<: [*backend-conf, *minion-db-network]