Skip to content

Commit

Permalink
Merge branch 'main' into open-api-deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
@teolemon
teolemon authored Nov 9, 2023
2 parents cd3608a + 323bd92 commit f9ad404
Show file tree
Hide file tree
Showing 3,392 changed files with 557,174 additions and 463,127 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file added .DS_Store
View file
Binary file not shown.
4 changes: 3 additions & 1 deletion .dockerignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ node_modules
.github
.vscode
logs
debug/
perl-language-server.log

html/images/misc/openfoodfacts-visual-decision-05-03-13.pdf
html/images/misc/20130416_QUOz.pdf
Expand All @@ -29,4 +31,4 @@ packager-codes/*.csv
packager-codes/*.tsv
packager-codes/*.py
packager-codes/*.json
taxonomies*/**/*.txt
taxonomies*/**/*.sto
24 changes: 21 additions & 3 deletions .env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ 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
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,15 @@ MONGODB_HOST=mongodb
MONGODB_CACHE_SIZE=8 # GB
MONGO_INITDB_ROOT_USERNAME=root
MONGO_INITDB_ROOT_PASSWORD=test
ROBOTOFF_URL=http://api: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
# use this to push products to openfoodfacts-search
# in dev: searchredis:6379 (with openfoodfacts-search running in docker in same network)
REDIS_URL=
GOOGLE_CLOUD_VISION_API_KEY=
CROWDIN_PROJECT_IDENTIFIER=
CROWDIN_PROJECT_KEY=
Expand All @@ -46,3 +62,5 @@ GEOLITE2_ACCOUNT_ID=
ELASTICSEARCH_HOSTS=
LOG_LEVEL_ROOT=TRACE
LOG_LEVEL_MONGODB=TRACE

BUILD_CACHE_REPO=openfoodfacts/openfoodfacts-build-cache
3 changes: 3 additions & 0 deletions .eslintignore
View file
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 f9ad404

Please sign in to comment.