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

Fix services startup #85

Merged
merged 6 commits into from
Jan 20, 2025
Merged

Fix services startup #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0a234d2
fix: backend startup
arcogabbo Sep 23, 2024
c85f480
fix: fn-admin startup
arcogabbo Sep 23, 2024
1c0b764
feat: add git to functions base container
arcogabbo Sep 23, 2024
b72a2fa
fixed backend startup
arcogabbo Nov 14, 2024
b7877b6
Node 20 functions
giamma1295 Jan 13, 2025
ae45412
improvements
arcogabbo Jan 20, 2025
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
9 changes: 8 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -120,7 +127,7 @@ services:
networks:
- io-fn
depends_on:
- functions-node-18
- functions-node-20
- traefik
labels:
- "traefik.enable=true"
Expand Down
18 changes: 18 additions & 0 deletions env.io-backend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 6 additions & 1 deletion env.io-functions-admin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 12 additions & 1 deletion env.io-functions-app
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion env.io-functions-app-messages
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
2 changes: 2 additions & 0 deletions functions-node-18/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
10 changes: 10 additions & 0 deletions functions-node-20/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
2 changes: 1 addition & 1 deletion io-functions-admin/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM functions-node-18
FROM functions-node-20

ARG FUNCTIONS_ADMIN_COMMIT_SHA

Expand Down
Loading