Enhance Docker and PowerShell scripts for improved functionality and maintainability
All checks were successful
Publish FaceAI Container / publish (push) Successful in 6m52s
All checks were successful
Publish FaceAI Container / publish (push) Successful in 6m52s
- Updated Dockerfile to include default MySQL client for better database interaction. - Modified entrypoint.sh to support additional workspace for legacy applications and added MySQL readiness check before startup. - Enhanced PowerShell script for trimming MySQL dumps to include overlay dumps and improved error handling for missing race and user IDs. - Added new image files and face encoding pickles for various projects, ensuring comprehensive data availability. - Removed outdated face encoding pickle from PISA directory to maintain data relevance. Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
parent
c227fce036
commit
dd7d4c865b
54 changed files with 492 additions and 144 deletions
|
|
@ -16,7 +16,7 @@ services:
|
|||
FACEAI_DEV_DISPLAY_NAME: ${FACEAI_DEV_DISPLAY_NAME:-Local Model User}
|
||||
FACEAI_DEV_EMAIL: ${FACEAI_DEV_EMAIL:-local.model.user@example.invalid}
|
||||
FACEAI_DEV_MEMBERSHIP_STATUS: ${FACEAI_DEV_MEMBERSHIP_STATUS:-active}
|
||||
LOCAL_APP_INSTANCE: ${LOCAL_APP_INSTANCE:-local-model}
|
||||
LOCAL_APP_INSTANCE: ${LOCAL_APP_INSTANCE:-main}
|
||||
LOCAL_DOCBASE: /data/docbase/
|
||||
FACEAI_FEATURE_ENABLED: ${FACEAI_FEATURE_ENABLED:-1}
|
||||
FACEAI_FRONTEND_URL: ${FACEAI_FRONTEND_URL:-http://localhost:3001}
|
||||
|
|
@ -26,6 +26,7 @@ services:
|
|||
FACEAI_IDENTITY_COOKIE: ${FACEAI_IDENTITY_COOKIE:-rus_faceai_identity}
|
||||
volumes:
|
||||
- ../www:/workspace/www:ro
|
||||
- ../rus:/workspace/rus:ro
|
||||
- ../test_pkl:/workspace/test_pkl:ro
|
||||
- ./runtime/docbase:/data/docbase
|
||||
- ./runtime/tomcat-work:/usr/local/tomcat/work
|
||||
|
|
@ -46,15 +47,21 @@ services:
|
|||
- --max_allowed_packet=1G
|
||||
- --net_read_timeout=600
|
||||
- --net_write_timeout=600
|
||||
- --lower_case_table_names=1
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: root
|
||||
MYSQL_DATABASE: pg
|
||||
MYSQL_ROOT_HOST: '%'
|
||||
LOCAL_DB_SEED_DUMP: ${LOCAL_DB_SEED_DUMP:-pg-model-seed-trimmed-20260421.sql}
|
||||
LOCAL_DB_SEED_DUMP: ${LOCAL_DB_SEED_DUMP:-pg-local-purpose-seed-20260422.sql}
|
||||
LOCAL_DB_OVERLAY_DUMP: ${LOCAL_DB_OVERLAY_DUMP:-}
|
||||
LOCAL_DOCBASE: /data/docbase/
|
||||
LOCAL_MAIL_SMTP_HOST: maildump
|
||||
LOCAL_MAIL_SMTP_PORT: 1025
|
||||
LOCAL_SOURCE_DIR: /workspace/www/
|
||||
LOCAL_TEST_USER_ID: ${LOCAL_TEST_USER_ID:-2}
|
||||
LOCAL_TEST_USER_LOGIN: ${LOCAL_TEST_USER_LOGIN:-test}
|
||||
LOCAL_TEST_USER_PASSWORD: ${LOCAL_TEST_USER_PASSWORD:-test1}
|
||||
LOCAL_TEST_USER_EMAIL: ${LOCAL_TEST_USER_EMAIL:-localtest@regalamiunsorriso.test}
|
||||
volumes:
|
||||
- mysql-data:/var/lib/mysql
|
||||
- ../db:/seed:ro
|
||||
|
|
@ -63,11 +70,9 @@ services:
|
|||
healthcheck:
|
||||
test:
|
||||
- CMD
|
||||
- mysqladmin
|
||||
- ping
|
||||
- -h
|
||||
- 127.0.0.1
|
||||
- -proot
|
||||
- sh
|
||||
- -lc
|
||||
- mysql -uroot -p"$$MYSQL_ROOT_PASSWORD" -Nse "SELECT CASE WHEN EXISTS (SELECT 1 FROM pg.parm WHERE codice = 'REWRITE_URL_ENABLE' AND numero = 1) AND EXISTS (SELECT 1 FROM pg.gara LIMIT 1) THEN 1 ELSE 0 END" | grep -qx 1
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 30
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue