diff --git a/docker-compose.yml b/docker-compose.yml index fa470e9..712b18b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -104,6 +104,13 @@ services: dockerfile: functions-node-18/Dockerfile command: /bin/true + functions-node-20: + image: functions-node-20 + build: + context: ./ + dockerfile: functions-node-20/Dockerfile + command: /bin/true + functions-admin: image: io-functions-admin build: @@ -120,7 +127,7 @@ services: networks: - io-fn depends_on: - - functions-node-18 + - functions-node-20 - traefik labels: - "traefik.enable=true" diff --git a/env.io-backend b/env.io-backend index bc01534..fcff6b0 100644 --- a/env.io-backend +++ b/env.io-backend @@ -189,3 +189,21 @@ LOCKED_PROFILES_TABLE_NAME=lockedProfiles # ----------------------------------- FF_UNIQUE_EMAIL_ENFORCEMENT=${FF_UNIQUE_EMAIL_ENFORCEMENT} UNIQUE_EMAIL_ENFORCEMENT_USERS="ISPXNB32R82Y766D" +SERVICES_APP_BACKEND_API_BASE_PATH=/api/v1 +SERVICES_APP_BACKEND_BASE_PATH=/api/v1 +SERVICES_APP_BACKEND_API_URL=http://localhost:7071 +TRIAL_SYSTEM_API_BASE_PATH=/api/v1 +TRIAL_SYSTEM_API_KEY=key +TRIAL_SYSTEM_API_URL=http://localhost:7071 +IO_WALLET_API_KEY=key +IO_WALLET_API_URL=http://localhost:7071 +IO_WALLET_API_BASE_PATH=/api/v1 +IO_WALLET_TRIAL_ID=id + +TRIAL_SYSTEM_APIM_KEY=key +TRIAL_SYSTEM_APIM_URL=http://localhost:7071 +TRIAL_SYSTEM_APIM_BASE_PATH=/api/v1 + +IO_FIMS_API_KEY=key +IO_FIMS_API_URL=http://localhost:7071 +IO_FIMS_API_BASE_PATH=/api/v1 diff --git a/env.io-functions-admin b/env.io-functions-admin index 739c096..c2033c9 100644 --- a/env.io-functions-admin +++ b/env.io-functions-admin @@ -65,6 +65,11 @@ LOCKED_PROFILES_TABLE_NAME=lockedProfiles # EMAIL UNIQUENESS VARIABLES # ----------------------------------- CitizenAuthStorageConnection=${STORAGE_CONNECTION_STRING} -SanitizeUserProfileQueueName=sanitizeUserProfileTest +SanitizeUserProfileQueueName=sanitize-user-profile-test PROFILE_EMAILS_STORAGE_CONNECTION_STRING=${STORAGE_CONNECTION_STRING} PROFILE_EMAILS_TABLE_NAME=${PROFILE_EMAIL_STORAGE_TABLE_NAME} + +# Instant delete feature(skips grace period defined in env var USER_DATA_DELETE_DELAY_DAYS) +INSTANT_DELETE_ENABLED_USERS="" + +DOTNET_EnableWriteXorExecute=0 diff --git a/env.io-functions-app b/env.io-functions-app index 8ea70cb..3daae45 100644 --- a/env.io-functions-app +++ b/env.io-functions-app @@ -15,7 +15,18 @@ MAIL_FROM=sender@example.com FUNCTIONS_PUBLIC_URL=http://functions-public.localhost PUBLIC_API_URL=http://host.docker.internal:${API_GATEWAY_PORT}/functions-services PUBLIC_API_KEY=api_key -SPID_LOGS_PUBLIC_KEY=spid_logs_public_key + +# locally generated key +SPID_LOGS_PUBLIC_KEY="-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiKsFNgoDTJjfU9eLWuzd +y1c50ynYshmhppcf4bpJqLnpcEDMk9JgC1Cw9f/f2IQYqMCGrzHsr2LWw7NqdaFd +zDUcw4ZL742ZwQ/getuulYM7MIpPKfAqkP4g77Grprd4YdlFJrxNtCkx+ltq150U +njhgBske8Kdej358i1osCC9knza5FIFFCYeuXEKj473ZQWJN9tMLhLbeZ4GaBsLU +qqWt4OOUe6WjvKQguqFAUlWDEI45gsGSR8PUOgmHiW1w0L/FkSSaIaYDZi7RL9ta +ZSUEejGuksEWv+eeEPNsgYxKaHTzYP1MVTBqaToxlCDYvTjqxPbfRDEf7p/fm5UN +cQIDAQAB +-----END PUBLIC KEY-----" + DPO_EMAIL_ADDRESS=dpo@example.com SLOT_TASK_HUBNAME=IoFunctionApp diff --git a/env.io-functions-app-messages b/env.io-functions-app-messages index be6b013..aac5659 100644 --- a/env.io-functions-app-messages +++ b/env.io-functions-app-messages @@ -1,7 +1,9 @@ NODE_ENV=dev FUNCTIONS_WORKER_RUNTIME=node -WEBSITE_NODE_DEFAULT_VERSION=14.16.0 +WEBSITE_NODE_DEFAULT_VERSION=18.13.0 + +DOTNET_EnableWriteXorExecute=0 AzureWebJobsStorage=${STORAGE_CONNECTION_STRING} COSMOSDB_CGN_URI=${COSMOSDB_URI} diff --git a/functions-node-18/Dockerfile b/functions-node-18/Dockerfile index cdfd195..bc59a44 100644 --- a/functions-node-18/Dockerfile +++ b/functions-node-18/Dockerfile @@ -2,6 +2,8 @@ FROM node:18.13.0 WORKDIR /usr/src/app +RUN apt-get install git + RUN npm i -g azure-functions-core-tools@4 --unsafe-perm true ENV AzureWebJobsScriptRoot=/usr/src/app \ diff --git a/functions-node-20/Dockerfile b/functions-node-20/Dockerfile new file mode 100644 index 0000000..a3b798e --- /dev/null +++ b/functions-node-20/Dockerfile @@ -0,0 +1,10 @@ +FROM node:20.12.2 + +WORKDIR /usr/src/app + +RUN npm i -g azure-functions-core-tools@4 --unsafe-perm true + +ENV AzureWebJobsScriptRoot=/usr/src/app \ + AzureFunctionsJobHost__Logging__Console__IsEnabled=true + +CMD ["func", "start", "--javascript"] diff --git a/io-functions-admin/Dockerfile b/io-functions-admin/Dockerfile index 8d32bee..2de4622 100644 --- a/io-functions-admin/Dockerfile +++ b/io-functions-admin/Dockerfile @@ -1,4 +1,4 @@ -FROM functions-node-18 +FROM functions-node-20 ARG FUNCTIONS_ADMIN_COMMIT_SHA