diff --git a/deploy/qa-ext-values.yaml b/deploy/qa-ext-values.yaml index 91fa40d1..48d1bfc2 100644 --- a/deploy/qa-ext-values.yaml +++ b/deploy/qa-ext-values.yaml @@ -1,6 +1,6 @@ externalHost: qa.serval-api.org environment: Production -deploymentVersion: '1.8.QA7' +deploymentVersion: '1.8.QA9' alertEmail: ext-qa-serval-alerts@languagetechnology.org emailsToAlert: john_lambert@sil.org enableTls: true @@ -8,7 +8,7 @@ namespace: serval auth0Domain: dev-sillsdev.auth0.com lokiTenent: serval-tenant lokiUrl: http://loki-distributed-gateway.loki.svc.cluster.local -servalImage: ghcr.io/sillsdev/serval:1.8.7 +servalImage: ghcr.io/sillsdev/serval:1.8.9 ClearMLDockerImage: ghcr.io/sillsdev/machine.py:1.8.1 ClearMLQueue: production MongoConnectionPrefix: qa_ diff --git a/deploy/values.yaml b/deploy/values.yaml index 85410787..94d9b0d1 100644 --- a/deploy/values.yaml +++ b/deploy/values.yaml @@ -1,6 +1,6 @@ externalHost: prod.serval-api.org environment: Production -deploymentVersion: '1.8.5' +deploymentVersion: '1.8.9' alertEmail: prod-serval-alerts@languagetechnology.org emailsToAlert: 'john_lambert@sil.org, eli_lowry@sil.org' enableTls: true @@ -8,7 +8,7 @@ namespace: serval auth0Domain: languagetechnology.auth0.com lokiTenent: nlp-tenant lokiUrl: http://loki-distributed-gateway.loki.svc.cluster.local -servalImage: ghcr.io/sillsdev/serval:1.8.5 +servalImage: ghcr.io/sillsdev/serval:1.8.9 ClearMLDockerImage: ghcr.io/sillsdev/machine.py:1.8.1 ClearMLQueue: production MongoConnectionPrefix: prod_ diff --git a/docker-compose.withatlas.yml b/docker-compose.withatlas.yml index b23d0be0..aa7a55db 100644 --- a/docker-compose.withatlas.yml +++ b/docker-compose.withatlas.yml @@ -22,6 +22,7 @@ services: - ASPNETCORE_Translation__Engines__1__Address=http://machine-engine - ASPNETCORE_Translation__Engines__2__Type=Nmt - ASPNETCORE_Translation__Engines__2__Address=http://machine-engine + - "Bugsnag__ApiKey=${Bugsnag__ApiKey}" expose: - 80 - 81 @@ -88,13 +89,14 @@ services: - ClearML__Project=docker-compose - "ClearML__AccessKey=${ClearML_AccessKey:?access key needed}" - "ClearML__SecretKey=${ClearML_SecretKey:?secret key needed}" - - BuildJob__ClearML__0__Queue=lambert_24gb + - BuildJob__ClearML__0__Queue=${CLEARML_GPU_QUEUE:-lambert_24gb} - BuildJob__ClearML__0__DockerImage=${MACHINE_PY_IMAGE:-ghcr.io/sillsdev/machine.py:latest} - - BuildJob__ClearML__1__Queue=lambert_24gb.cpu_only + - BuildJob__ClearML__1__Queue=${CLEARML_CPU_QUEUE:-lambert_24gb.cpu_only} - BuildJob__ClearML__1__DockerImage=${MACHINE_PY_CPU_IMAGE:-ghcr.io/sillsdev/machine.py:latest.cpu_only} - SharedFile__Uri=s3://silnlp/docker-compose/ - "SharedFile__S3AccessKeyId=${AWS_ACCESS_KEY_ID:?access key needed}" - "SharedFile__S3SecretAccessKey=${AWS_SECRET_ACCESS_KEY:?secret key needed}" + - "Bugsnag__ApiKey=${Bugsnag__ApiKey}" expose: - 80 ports: @@ -132,13 +134,14 @@ services: - ClearML__Project=docker-compose - "ClearML__AccessKey=${ClearML_AccessKey:?access key needed}" - "ClearML__SecretKey=${ClearML_SecretKey:?secret key needed}" - - BuildJob__ClearML__0__Queue=lambert_24gb + - BuildJob__ClearML__0__Queue=${CLEARML_GPU_QUEUE:-lambert_24gb} - BuildJob__ClearML__0__DockerImage=${MACHINE_PY_IMAGE:-ghcr.io/sillsdev/machine.py:latest} - - BuildJob__ClearML__1__Queue=lambert_24gb.cpu_only + - BuildJob__ClearML__1__Queue=${CLEARML_CPU_QUEUE:-lambert_24gb.cpu_only} - BuildJob__ClearML__1__DockerImage=${MACHINE_PY_CPU_IMAGE:-ghcr.io/sillsdev/machine.py:latest.cpu_only} - SharedFile__Uri=s3://silnlp/docker-compose/ - "SharedFile__S3AccessKeyId=${AWS_ACCESS_KEY_ID:?access key needed}" - "SharedFile__S3SecretAccessKey=${AWS_SECRET_ACCESS_KEY:?secret key needed}" + - "Bugsnag__ApiKey=${Bugsnag__ApiKey}" expose: - 80 ports: