Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wl sync prepare #245

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Wl sync prepare #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7b1909
Update all in one and run.sh
Temppus Mar 27, 2024
8b226ce
Fix SF_VERSION env name
Temppus Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sf-docker/all-in-one/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ GstPipelineTemplate=uridecodebin uri={0} source::latency=0 ! queue max-size-buff
REGISTRY=registry.gitlab.com/innovatrics/smartface/

# Version
SF_VERSION=v5_4.24.0
SF_VERSION=v5_4.25.0.5995-dev
AC_VERSION=v5_1.10.0
SFS_VERSION=v5_1.23.0

Expand Down
61 changes: 61 additions & 0 deletions sf-docker/all-in-one/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,67 @@ services:
volumes:
- "./iengine.lic:/etc/innovatrics/iengine.lic"

db-synchronization-leader:
image: ${REGISTRY}sf-db-synchronization-leader:${SF_VERSION}
container_name: SFDbSynchronizationLeader
ports:
- 8100:${Hosting__Port}
restart: unless-stopped
environment:
- RabbitMQ__Hostname
- RabbitMQ__Username
- RabbitMQ__Password
- RabbitMQ__Port
- RabbitMQ__StreamsPort
- RabbitMQ__VirtualHost
- RabbitMQ__UseSsl
- Hosting__Host
- Hosting__Port
- AppSettings__Log_RollingFile_Enabled=false
- AppSettings__USE_JAEGER_APP_SETTINGS
- JAEGER_AGENT_HOST
- S3Bucket__Endpoint
- S3Bucket__BucketName
- S3Bucket__AccessKey
- S3Bucket__SecretKey
- Authentication__UseAuthentication
- Authentication__IgnoreHttpsIssuerCheck
- Authentication__Authority
- Authentication__Audience
volumes:
- "./iengine.lic:/etc/innovatrics/iengine.lic"

db-synchronization-follower:
image: ${REGISTRY}sf-db-synchronization-follower:${SF_VERSION}
container_name: SFDbSynchronizationFollower
restart: unless-stopped
environment:
- RabbitMQ__Hostname
- RabbitMQ__Username
- RabbitMQ__Password
- RabbitMQ__Port
- RabbitMQ__StreamsPort
- RabbitMQ__VirtualHost
- RabbitMQ__UseSsl
- ConnectionStrings__CoreDbContext
- Database__DbEngine
- Hosting__Host
- Hosting__Port
- AppSettings__Log_RollingFile_Enabled=false
- AppSettings__USE_JAEGER_APP_SETTINGS
- JAEGER_AGENT_HOST
- S3Bucket__Endpoint
- S3Bucket__BucketName
- S3Bucket__AccessKey
- S3Bucket__SecretKey
- ClientAuthentication__UseAuthentication
- ClientAuthentication__TokenEndpoint
- ClientAuthentication__ClientId
- ClientAuthentication__ClientSecret
- ClientAuthentication__Audience
volumes:
- "./iengine.lic:/etc/innovatrics/iengine.lic"

access-controller:
image: ${REGISTRY}sf-access-controller:${AC_VERSION}
container_name: SFAccessController
Expand Down
6 changes: 4 additions & 2 deletions sf-docker/all-in-one/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ if [[ "$DB_ENGINE" == "MsSql" ]]; then
run-migration \
-p "$(getvalue CameraServicesCount)" \
-c "$(getvalue ConnectionStrings__CoreDbContext)" -dbe $DB_ENGINE \
--dependencies-availability-timeout 120 \
--rmq-host "$(getvalue RabbitMQ__Hostname)" --rmq-user "$(getvalue RabbitMQ__Username)" --rmq-pass "$(getvalue RabbitMQ__Password)" \
--rmq-virtual-host "$(getvalue RabbitMQ__VirtualHost)" --rmq-port "$(getvalue RabbitMQ__Port)" --rmq-use-ssl "$(getvalue RabbitMQ__UseSsl)"
--rmq-virtual-host "$(getvalue RabbitMQ__VirtualHost)" --rmq-port "$(getvalue RabbitMQ__Port)" --rmq-streams-port "$(getvalue RabbitMQ__StreamsPort)" --rmq-use-ssl "$(getvalue RabbitMQ__UseSsl)"
elif [[ "$DB_ENGINE" == "PgSql" ]]; then
# create SmartFace database in PgSql
docker exec pgsql psql -U postgres -c "CREATE DATABASE smartface" || true
Expand All @@ -84,8 +85,9 @@ elif [[ "$DB_ENGINE" == "PgSql" ]]; then
run-migration \
-p "$(getvalue CameraServicesCount)" \
-c "$(getvalue ConnectionStrings__CoreDbContext)" -dbe $DB_ENGINE \
--dependencies-availability-timeout 120 \
--rmq-host "$(getvalue RabbitMQ__Hostname)" --rmq-user "$(getvalue RabbitMQ__Username)" --rmq-pass "$(getvalue RabbitMQ__Password)" \
--rmq-virtual-host "$(getvalue RabbitMQ__VirtualHost)" --rmq-port "$(getvalue RabbitMQ__Port)" --rmq-use-ssl "$(getvalue RabbitMQ__UseSsl)"
--rmq-virtual-host "$(getvalue RabbitMQ__VirtualHost)" --rmq-port "$(getvalue RabbitMQ__Port)" --rmq-streams-port "$(getvalue RabbitMQ__StreamsPort)" --rmq-use-ssl "$(getvalue RabbitMQ__UseSsl)"
else
echo "Unknown DB engine: ${DB_ENGINE}!" >&2
exit 1
Expand Down