Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 30 additions & 0 deletions docker-compose.test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ services:
image: ffc-doc-statement-data-development
container_name: ffc-doc-statement-data-test
command: npm run test
depends_on:
- servicebus-emulator
volumes:
- ./app:/home/node/app
- ./test:/home/node/test
Expand All @@ -34,5 +36,33 @@ services:
labels:
com.docker.compose.pay.role: test

ffc-doc-statement-data-sqledge:
container_name: "ffc-doc-statement-data-sqledge"
image: "mcr.microsoft.com/azure-sql-edge:latest"
environment:
ACCEPT_EULA: "Y"
MSSQL_SA_PASSWORD: "DummyStrongPa$$w0rd" # To be filled by user as per policy : https://learn.microsoft.com/en-us/sql/relational-databases/security/strong-passwords?view=sql-server-linux-ver16

servicebus-emulator:
container_name: "servicebus-emulator"
image: mcr.microsoft.com/azure-messaging/servicebus-emulator:latest
pull_policy: always
volumes:
- "./BusConfig.json:/ServiceBus_Emulator/ConfigFiles/Config.json"
ports:
- "5672:5672"
environment:
SQL_SERVER: ffc-doc-statement-data-sqledge
MSSQL_SA_PASSWORD: "DummyStrongPa$$w0rd" # Password should be same as what is set for SQL Edge
ACCEPT_EULA: "Y"
depends_on:
- ffc-doc-statement-data-sqledge

healthcheck:
test: ["CMD-SHELL", "nc -z localhost 5672"]
interval: 5s
timeout: 3s
retries: 30

volumes:
postgres_data:
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ services:

ffc-doc-statement-data-azurite:
image: mcr.microsoft.com/azure-storage/azurite:3.35.0
command: "azurite-blob --loose --blobHost 0.0.0.0"
command: "azurite-blob --skipApiVersionCheck --blobHost 0.0.0.0"
labels:
com.docker.compose.pay.role: ffc-doc-statement-data-azurite
32 changes: 22 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ffc-doc-statement-data",
"version": "3.2.16",
"version": "3.2.17",
"description": "FFC Statement data integration service",
"homepage": "https://github.com/DEFRA/ffc-doc-statement-data",
"main": "app/index.js",
Expand Down Expand Up @@ -28,7 +28,7 @@
"license": "OGL-UK-3.0",
"dependencies": {
"@azure/identity": "4.4.1",
"@azure/storage-blob": "12.29.1",
"@azure/storage-blob": "12.31.0",
"applicationinsights": "2.9.6",
"ffc-alerting-utils": "1.0.6",
"ffc-database": "1.0.23",
Expand Down