Skip to content

Commit

Permalink
Merge branch 'main' into lighthouse
Browse files Browse the repository at this point in the history
  • Loading branch information
teolemon authored Sep 15, 2024
2 parents 67a03f8 + 508d767 commit 71a3b6c
Show file tree
Hide file tree
Showing 4,856 changed files with 1,258,480 additions and 862,418 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file added .DS_Store
Binary file not shown.
6 changes: 6 additions & 0 deletions .check_perl_excludes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
scripts/packager-codes/fr-packagers-refresh.pl
scripts/packager-codes/ee-packagers-xml2tsv.pl
scripts/packager-codes/de-packagers-refresh.pl
scripts/packager-codes/es-packagers-html2csv.pl
scripts/packager-codes/fi-packagers-xls2csv.pl
scripts/packager-codes/se-packagers-html2tsv.pl
57 changes: 41 additions & 16 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,50 @@
{
"name": "Perl",
"initializeCommand": "make run_deps",
"dockerComposeFile": [
"../docker-compose.yml",
"../docker/dev.yml",
"../docker/admin-uis.yml",
"../docker/vscode.yml"
"../docker/run.yml",
"../docker/devcontainer.yml"
],
"containerUser": "root",
"capAdd": [
"SYS_PTRACE"
],
"securityOpt": [
"seccomp=unconfined"
],
"service": "backend",
"runServices": [
"memcached",
"postgres",
"dynamicfront",
"frontend",
"incron",
"minion"
],
"workspaceFolder": "/opt/product-opener",
"settings": {
"terminal.integrated.shell.linux": "/bin/bash"
"customizations": {
"vscode": {
"settings": {
"terminal.integrated.shell.linux": "/bin/bash"
},
"extensions": [
"richterger.perl",
"d9705996.perl-toolbox",
"redhat.vscode-yaml",
"dbaeumer.vscode-eslint",
"stylelint.vscode-stylelint",
"syler.sass-indented",
"mrorz.language-gettext"
]
}
},
"runArgs": ["-u", "vscode", "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
"extensions": [
"mortenhenriksen.perl-debug",
"d9705996.perl-toolbox",
"redhat.vscode-yaml",
"dbaeumer.vscode-eslint",
"stylelint.vscode-stylelint",
"syler.sass-indented",
"mrorz.language-gettext",
"eg2.vscode-npm-script"
]
}
"features": {
"ghcr.io/devcontainers/features/git:1":{},
"ghcr.io/devcontainers/features/github-cli:1":{},
"ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {
"packages": "libterm-readline-gnu-perl"
}
}
}
9 changes: 8 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ node_modules
.github
.vscode
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
Expand All @@ -29,4 +36,4 @@ packager-codes/*.csv
packager-codes/*.tsv
packager-codes/*.py
packager-codes/*.json
taxonomies*/**/*.txt
taxonomies*/**/*.sto
40 changes: 35 additions & 5 deletions .env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# docker config
DOCKER_CLIENT_TIMEOUT=320
COMPOSE_HTTP_TIMEOUT=320
COMPOSE_PROJECT_NAME=po
COMPOSE_PROJECT_NAME=po_off
COMPOSE_PATH_SEPARATOR=;
COMPOSE_FILE=docker-compose.yml;docker/dev.yml
COMPOSE_PROFILES=off
Expand All @@ -14,12 +14,12 @@ ADMIN_EXPOSE=127.0.0.1:
# version for backend and frontend images
TAG=latest
# setting to align host user to internal user
USER_UID=1000
USER_GID=1000
# USER_UID=1000
# USER_GID=1000

# static lang dependent files for the website
# we have a minimal set of files in server repo, in prod we use main repo
WEB_LANG_PATH=./lang-default
WEB_RESOURCES_PATH=./web-default

# env vars
PRODUCERS_PLATFORM=0
Expand All @@ -28,6 +28,14 @@ PRODUCT_OPENER_PORT=80
PRODUCT_OPENER_FLAVOR=openfoodfacts
PRODUCT_OPENER_FLAVOR_SHORT=off

# do you want extended dev packages ?
# (removed on standard builds to speed installation up and gain in stability)
# CPANMOPTS=--with-develop --with-feature=off_server_dev_tools

# if 1 we log emails instead of sending them
# useful in dev mode
OFF_LOG_EMAILS=1

POSTGRES_USER=productopener
POSTGRES_PASSWORD=productopener
MINION_MODE=dev
Expand All @@ -36,7 +44,16 @@ MONGODB_HOST=mongodb
MONGODB_CACHE_SIZE=8 # GB
MONGO_INITDB_ROOT_USERNAME=root
MONGO_INITDB_ROOT_PASSWORD=test
ROBOTOFF_URL=http://host.docker.internal:5500 # connect to Robotoff running in separate docker-compose deployment
ROBOTOFF_URL=http://robotoff.openfoodfacts.localhost:5500 # connect to Robotoff running in separate docker-compose deployment
# connect to openfoodfacts-query running in separate docker-compose deployment.
# To test locally change to http://host.docker.internal:5510
QUERY_URL=http://query:5510
EVENTS_URL=
FACETS_KP_URL = https://facets-kp.openfoodfacts.org/render-to-html
# we push updated products to Redis stream so that every service is notified
# when a product is updated/deleted/created
# use `redis:6379` locally if you want to enable Redis
REDIS_URL=
GOOGLE_CLOUD_VISION_API_KEY=
CROWDIN_PROJECT_IDENTIFIER=
CROWDIN_PROJECT_KEY=
Expand All @@ -46,3 +63,16 @@ GEOLITE2_ACCOUNT_ID=
ELASTICSEARCH_HOSTS=
LOG_LEVEL_ROOT=TRACE
LOG_LEVEL_MONGODB=TRACE
LOG_LEVEL_RATE_LIMITER=TRACE
ODOO_CRM_URL=
ODOO_CRM_DB=
ODOO_CRM_USER=
ODOO_CRM_PASSWORD=

BUILD_CACHE_REPO=openfoodfacts/openfoodfacts-build-cache

# If you want the rate limiter to block requests (return 429) instead of doing nothing,
# set this to 1. Any other value will disable the blocking.
RATE_LIMITER_BLOCKING_ENABLED=1

COMMON_NET_NAME=off_shared_network
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ html/js/dist/
html/js/datatables.*.js
html/js/jquery*.js
html/js/sigma.*.js
html/js/hc-sticky.js
html/js/scrollNav.js
html/js/stikelem.js
Loading

0 comments on commit 71a3b6c

Please sign in to comment.