Skip to content

Commit a403e6e

Browse files
drizzenticdrizzentic
committed
standardize environment variables.
1 parent d0a94ef commit a403e6e

File tree

3 files changed

+43
-43
lines changed

3 files changed

+43
-43
lines changed

‎openfn/docker-compose.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.9'
22

33
services:
44
openfn:
5-
image: ${OpenFn_IMAGE}
5+
image: ${OPENFN_IMAGE}
66
# This command runs a shell script that performs the following actions:
77
# 1. Executes the Lightning.Release.migrate() function to handle database migrations.
88
# 2. Sets up a user with the provided first name, last name, email, password, and role using the Lightning.Setup.setup_user function.
@@ -16,22 +16,22 @@ services:
1616
deploy:
1717
resources:
1818
limits:
19-
cpus: '${DOCKER_WEB_CPUS:-0}'
20-
memory: '${DOCKER_WEB_MEMORY:-0}'
19+
cpus: '${OPENFN_DOCKER_WEB_CPUS:-0}'
20+
memory: '${OPENFN_DOCKER_WEB_MEMORY:-0}'
2121
environment:
22-
- DATABASE_URL=${DATABASE_URL}
23-
- DISABLE_DB_SSL=${DISABLE_DB_SSL}
24-
- IS_RESETTABLE_DEMO=${IS_RESETTABLE_DEMO}
25-
- LISTEN_ADDRESS=${LISTEN_ADDRESS}
26-
- LOG_LEVEL=${LOG_LEVEL}
27-
- ORIGINS=${ORIGINS}
28-
- PRIMARY_ENCRYPTION_KEY=${PRIMARY_ENCRYPTION_KEY}
29-
- SECRET_KEY_BASE=${SECRET_KEY_BASE}
22+
- DATABASE_URL=${OPENFN_DATABASE_URL}
23+
- DISABLE_DB_SSL=${OPENFN_DISABLE_DB_SSL}
24+
- IS_RESETTABLE_DEMO=${OPENFN_IS_RESETTABLE_DEMO}
25+
- LISTEN_ADDRESS=${OPENFN_LISTEN_ADDRESS}
26+
- LOG_LEVEL=${OPENFN_LOG_LEVEL}
27+
- ORIGINS=${OPENFN_ORIGINS}
28+
- PRIMARY_ENCRYPTION_KEY=${OPENFN_PRIMARY_ENCRYPTION_KEY}
29+
- SECRET_KEY_BASE=${OPENFN_SECRET_KEY_BASE}
3030
- WORKER_RUNS_PRIVATE_KEY=${OPENFN_WORKER_RUNS_PRIVATE_KEY}
31-
- WORKER_SECRET=${WORKER_SECRET}
32-
- KAFKA_TRIGGERS_ENABLED=${KAFKA_TRIGGERS_ENABLED}
31+
- WORKER_SECRET=${OPENFN_WORKER_SECRET}
32+
- KAFKA_TRIGGERS_ENABLED=${OPENFN_KAFKA_TRIGGERS_ENABLED}
3333
healthcheck:
34-
test: '${DOCKER_WEB_HEALTHCHECK_TEST:-curl localhost:4000/health_check}'
34+
test: '${ DOCKER_WEB_HEALTHCHECK_TEST:-curl localhost:4000/health_check}'
3535
interval: '10s'
3636
timeout: '3s'
3737
start_period: '5s'
@@ -40,15 +40,15 @@ services:
4040
- kafka_public
4141
- postgres
4242
worker:
43-
image: ${OpenFn_WORKER_IMAGE}
43+
image: ${OPENFN_WORKER_IMAGE}
4444
deploy:
4545
resources:
4646
limits:
47-
cpus: '${DOCKER_WORKER_CPUS:-0}'
48-
memory: '${DOCKER_WORKER_MEMORY:-0}'
47+
cpus: '${OPENFN_DOCKER_WORKER_CPUS:-0}'
48+
memory: '${OPENFN_DOCKER_WORKER_MEMORY:-0}'
4949
environment:
50-
- WORKER_LIGHTNING_PUBLIC_KEY=${WORKER_LIGHTNING_PUBLIC_KEY}
51-
- WORKER_SECRET=${WORKER_SECRET}
50+
- WORKER_LIGHTNING_PUBLIC_KEY=${OPENFN_WORKER_LIGHTNING_PUBLIC_KEY}
51+
- WORKER_SECRET=${OPENFN_WORKER_SECRET}
5252
- NODE_ENV=production
5353
command: [ 'pnpm', 'start:prod', '-l', 'ws://openfn:${URL_PORT-4000}/worker' ]
5454
networks:

‎openfn/importer/postgres/docker-compose.config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ services:
1717
POSTGRES_DATABASE: ${POSTGRES_DATABASE}
1818
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
1919
POSTGRES_PORT: ${POSTGRES_PORT}
20-
NEW_DATABASE_NAME: ${OpenFn_POSTGRESQL_DB}
21-
NEW_DATABASE_USER: ${OpenFn_POSTGRESQL_USERNAME}
22-
NEW_DATABASE_PASSWORD: ${OpenFn_POSTGRESQL_PASSWORD}
20+
NEW_DATABASE_NAME: ${OPENFN_POSTGRESQL_DB}
21+
NEW_DATABASE_USER: ${OPENFN_POSTGRESQL_USERNAME}
22+
NEW_DATABASE_PASSWORD: ${OPENFN_POSTGRESQL_PASSWORD}
2323
deploy:
2424
replicas: 1
2525
restart_policy:

‎openfn/package-metadata.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,34 @@
66
"version": "0.0.1",
77
"dependencies": ["database-postgres"],
88
"environmentVariables": {
9-
"DATABASE_URL": "postgresql://openfn:instant101@postgres-1:5432/lightning_dev",
10-
"DISABLE_DB_SSL": "true",
11-
"IS_RESETTABLE_DEMO": "true",
12-
"LISTEN_ADDRESS": "0.0.0.0",
13-
"LOG_LEVEL": "debug",
14-
"ORIGINS": "http://localhost:4000",
15-
"PRIMARY_ENCRYPTION_KEY": "KLu/IoZuaf+baDECd8wG4Z6auwNe6VAmwh9N8lWdJ1A=",
16-
"SECRET_KEY_BASE": "jGDxZj2O+Qzegm5wcZ940RfWO4D6RyU8thNCr5BUpHNwa7UNV52M1/Sn+7RxiP+f",
17-
"WORKER_RUNS_PRIVATE_KEY": "LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktnd2dnU2tBZ0VBQW9JQkFRREVtR3drUW5pT0hqVCsKMnkyRHFvRUhyT3dLZFI2RW9RWG9DeDE4MytXZ3hNcGthTFZyOFViYVVVQWNISGgzUFp2Z2UwcEIzTWlCWWR5Kwp1ajM1am5uK2JIdk9OZGRldWxOUUdpczdrVFFHRU1nTSs0Njhldm5RS0h6R29DRUhabDlZV0s0MUd5SEZCZXppCnJiOGx2T1A1NEtSTS90aE5pVGtHaUIvTGFLMldLcTh0VmtoSHBvaFE3OGIyR21vNzNmcWtuSGZNWnc0ZE43d1MKdldOamZIN3QwSmhUdW9mTXludUxSWmdFYUhmTDlnbytzZ0thc0ZUTmVvdEZIQkYxQTJjUDJCakwzaUxad0hmdQozTzEwZzg0aGZlTzJqTWlsZlladHNDdmxDTE1EZWNrdFJGWFl6V0dWc25FcFNiOStjcWJWUXRvdEU4QklON09GClRmaEx2MG9uQWdNQkFBRUNnZ0VBV3dmZyt5RTBSVXBEYThiOVdqdzNKdUN4STE1NzFSbmliRUhKVTZzdzNyS0EKck9HM0w5WTI0cHhBdlVPSm5GMFFzbThrUVQ4RU1MU3B6RDdjdDVON2RZMngvaGY4TThhL0VSWXM4cFlYcXI5Vwpnbnh3NldGZ0R6elFHZ0RIaW0raXNudk5ucFdEbTRGVTRObG02d2g5MzVSZlA2KzVaSjJucEJpZjhFWDJLdE9rCklOSHRVbFcwNFlXeDEwS0pIWWhYNFlydXVjL3MraXBORzBCSDZEdlJaQzQxSWw0N1luaTg1OERaL0FaeVNZN1kKWTlTamNKQ0QvUHBENTlNQjlSanJDQjhweDBjWGlsVXBVZUJSYndGalVwbWZuVmhIa1hiYlM1U0hXWWM4K3pLRQp2ajFqSEpxc2UyR0hxK2lHL1V3NTZvcHNyM2x3dHBRUXpVcEJGblhMMFFLQmdRRDM5bkV3L1NNVGhCallSd1JGCkY2a2xOYmltU2RGOVozQlZleXhrT0dUeU5NSCtYckhsQjFpOXBRRHdtMit3V2RvcWg1ZFRFbEU5K1crZ0FhN0YKbXlWc2xPTW4wdnZ2cXY2Wkp5SDRtNTVKU0lWSzBzRjRQOTRMYkpNSStHUW5VNnRha3Y0V0FSMkpXaURabGxPdAp3R01EQWZqRVIrSEFZeUJDKzNDL25MNHF5d0tCZ1FESzk3NERtV0c4VDMzNHBiUFVEYnpDbG9oTlQ2UldxMXVwCmJSWng4ZGpzZU0vQ09kZnBUcmJuMnk5dVc3Q1pBNFVPQ2s4REcxZ3ZENVVDYlpEUVdMaUp5RzZGdG5OdGgvaU8KT1dJM0UyczZOS0VMMU1NVzh5QWZwNzV4Ung5cnNaQzI2UEtqQ0pWL2lTVjcyNlQ1ZTFzRG5sZUtBb0JFZnlDRgpvbEhhMmhybWxRS0JnUURHT1YyOWd1K1NmMng1SVRTWm8xT1ZxbitGZDhlZno1d3V5YnZ3Rm1Fa2V1YUdXZDh1CnJ4UFM3MkJ6K0Y1dUJUWngvMWtLa0w4Zm94TUlQN0FleW1zOWhUeWVybnkyMk9TVlBJSmN3dExqMUxTeDN3L0kKK0kyaVpsYVl1akVlZXpXbHY1S2R0cUNORjk3Zzh0ck1NTnMySVZKa1h1NXFwUk82V0ZXRzZGL2h4d0tCZ0hnNApHYUpFSFhIT204ekZTU2lYSW5FWGZKQmVWZmJIOUxqNzFrbVRlR3RJZTdhTlVHZnVxY1BYUGRiZUZGSHRsY2ZsCkx6dWwzS3V6VFExdEhGTnIyWkl5MTlQM1o1TSs4R2c5Y1FFeVRWYmlpV2xha2x0cmttRnRtQTI4bE0zVEZPWmkKUUNWMUZpZStjaWRVeC9qRnFma1F0c1VXQ2llSUxSazZOY1d0WGpXcEFvR0JBTGN6Y210VGlUUEFvWnk0MFV1QQpTOXpUd3RsamhmUWJEVTVjb21EcnlKcnFRU0VOdmQ2VW5HdW0zYVNnNk13dDc0NGxidDAyMC9mSGI0WTJkTGhMCmx4YWJ5b1dQUElRRUpLL1NNOGtURFEvYTRyME5tZzhuV3h5bGFLcHQ5WUhmZ2NYMkYzSzUrc0VSUGNFcVZlWFMKdWZkYXdYQVlFampZK3V2UHZ2YzU3RU1aCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K",
18-
"WORKER_SECRET": "secret_here",
9+
"OPENFN_DATABASE_URL": "postgresql://openfn:instant101@postgres-1:5432/lightning_dev",
10+
"OPENFN_DISABLE_DB_SSL": "true",
11+
"OPENFN_IS_RESETTABLE_DEMO": "true",
12+
"OPENFN_LISTEN_ADDRESS": "0.0.0.0",
13+
"OPENFN_LOG_LEVEL": "debug",
14+
"OPENFN_ORIGINS": "http://localhost:4000",
15+
"OPENFN_PRIMARY_ENCRYPTION_KEY": "KLu/IoZuaf+baDECd8wG4Z6auwNe6VAmwh9N8lWdJ1A=",
16+
"OPENFN_SECRET_KEY_BASE": "jGDxZj2O+Qzegm5wcZ940RfWO4D6RyU8thNCr5BUpHNwa7UNV52M1/Sn+7RxiP+f",
17+
"OPENFN_WORKER_RUNS_PRIVATE_KEY": "LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktnd2dnU2tBZ0VBQW9JQkFRREVtR3drUW5pT0hqVCsKMnkyRHFvRUhyT3dLZFI2RW9RWG9DeDE4MytXZ3hNcGthTFZyOFViYVVVQWNISGgzUFp2Z2UwcEIzTWlCWWR5Kwp1ajM1am5uK2JIdk9OZGRldWxOUUdpczdrVFFHRU1nTSs0Njhldm5RS0h6R29DRUhabDlZV0s0MUd5SEZCZXppCnJiOGx2T1A1NEtSTS90aE5pVGtHaUIvTGFLMldLcTh0VmtoSHBvaFE3OGIyR21vNzNmcWtuSGZNWnc0ZE43d1MKdldOamZIN3QwSmhUdW9mTXludUxSWmdFYUhmTDlnbytzZ0thc0ZUTmVvdEZIQkYxQTJjUDJCakwzaUxad0hmdQozTzEwZzg0aGZlTzJqTWlsZlladHNDdmxDTE1EZWNrdFJGWFl6V0dWc25FcFNiOStjcWJWUXRvdEU4QklON09GClRmaEx2MG9uQWdNQkFBRUNnZ0VBV3dmZyt5RTBSVXBEYThiOVdqdzNKdUN4STE1NzFSbmliRUhKVTZzdzNyS0EKck9HM0w5WTI0cHhBdlVPSm5GMFFzbThrUVQ4RU1MU3B6RDdjdDVON2RZMngvaGY4TThhL0VSWXM4cFlYcXI5Vwpnbnh3NldGZ0R6elFHZ0RIaW0raXNudk5ucFdEbTRGVTRObG02d2g5MzVSZlA2KzVaSjJucEJpZjhFWDJLdE9rCklOSHRVbFcwNFlXeDEwS0pIWWhYNFlydXVjL3MraXBORzBCSDZEdlJaQzQxSWw0N1luaTg1OERaL0FaeVNZN1kKWTlTamNKQ0QvUHBENTlNQjlSanJDQjhweDBjWGlsVXBVZUJSYndGalVwbWZuVmhIa1hiYlM1U0hXWWM4K3pLRQp2ajFqSEpxc2UyR0hxK2lHL1V3NTZvcHNyM2x3dHBRUXpVcEJGblhMMFFLQmdRRDM5bkV3L1NNVGhCallSd1JGCkY2a2xOYmltU2RGOVozQlZleXhrT0dUeU5NSCtYckhsQjFpOXBRRHdtMit3V2RvcWg1ZFRFbEU5K1crZ0FhN0YKbXlWc2xPTW4wdnZ2cXY2Wkp5SDRtNTVKU0lWSzBzRjRQOTRMYkpNSStHUW5VNnRha3Y0V0FSMkpXaURabGxPdAp3R01EQWZqRVIrSEFZeUJDKzNDL25MNHF5d0tCZ1FESzk3NERtV0c4VDMzNHBiUFVEYnpDbG9oTlQ2UldxMXVwCmJSWng4ZGpzZU0vQ09kZnBUcmJuMnk5dVc3Q1pBNFVPQ2s4REcxZ3ZENVVDYlpEUVdMaUp5RzZGdG5OdGgvaU8KT1dJM0UyczZOS0VMMU1NVzh5QWZwNzV4Ung5cnNaQzI2UEtqQ0pWL2lTVjcyNlQ1ZTFzRG5sZUtBb0JFZnlDRgpvbEhhMmhybWxRS0JnUURHT1YyOWd1K1NmMng1SVRTWm8xT1ZxbitGZDhlZno1d3V5YnZ3Rm1Fa2V1YUdXZDh1CnJ4UFM3MkJ6K0Y1dUJUWngvMWtLa0w4Zm94TUlQN0FleW1zOWhUeWVybnkyMk9TVlBJSmN3dExqMUxTeDN3L0kKK0kyaVpsYVl1akVlZXpXbHY1S2R0cUNORjk3Zzh0ck1NTnMySVZKa1h1NXFwUk82V0ZXRzZGL2h4d0tCZ0hnNApHYUpFSFhIT204ekZTU2lYSW5FWGZKQmVWZmJIOUxqNzFrbVRlR3RJZTdhTlVHZnVxY1BYUGRiZUZGSHRsY2ZsCkx6dWwzS3V6VFExdEhGTnIyWkl5MTlQM1o1TSs4R2c5Y1FFeVRWYmlpV2xha2x0cmttRnRtQTI4bE0zVEZPWmkKUUNWMUZpZStjaWRVeC9qRnFma1F0c1VXQ2llSUxSazZOY1d0WGpXcEFvR0JBTGN6Y210VGlUUEFvWnk0MFV1QQpTOXpUd3RsamhmUWJEVTVjb21EcnlKcnFRU0VOdmQ2VW5HdW0zYVNnNk13dDc0NGxidDAyMC9mSGI0WTJkTGhMCmx4YWJ5b1dQUElRRUpLL1NNOGtURFEvYTRyME5tZzhuV3h5bGFLcHQ5WUhmZ2NYMkYzSzUrc0VSUGNFcVZlWFMKdWZkYXdYQVlFampZK3V2UHZ2YzU3RU1aCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K",
18+
"OPENFN_WORKER_SECRET": "secret_here",
1919
"POSTGRES_USER": "postgres",
2020
"POSTGRES_SERVICE": "postgres-1",
2121
"POSTGRES_DATABASE": "postgres",
2222
"POSTGRES_PASSWORD": "instant101",
2323
"POSTGRES_PORT": "5432",
24-
"OpenFn_POSTGRESQL_DB": "lightning_dev",
25-
"OpenFn_POSTGRESQL_USERNAME": "openfn",
26-
"OpenFn_POSTGRESQL_PASSWORD": "instant101",
27-
"WORKER_LIGHTNING_PUBLIC_KEY": "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUF4SmhzSkVKNGpoNDAvdHN0ZzZxQgpCNnpzQ25VZWhLRUY2QXNkZk4vbG9NVEtaR2kxYS9GRzJsRkFIQng0ZHoyYjRIdEtRZHpJZ1dIY3ZybzkrWTU1Ci9teDd6alhYWHJwVFVCb3JPNUUwQmhESURQdU92SHI1MENoOHhxQWhCMlpmV0ZpdU5Sc2h4UVhzNHEyL0piemoKK2VDa1RQN1lUWWs1Qm9nZnkyaXRsaXF2TFZaSVI2YUlVTy9HOWhwcU85MzZwSngzekdjT0hUZThFcjFqWTN4Kwo3ZENZVTdxSHpNcDdpMFdZQkdoM3kvWUtQcklDbXJCVXpYcUxSUndSZFFObkQ5Z1l5OTRpMmNCMzd0enRkSVBPCklYM2p0b3pJcFgyR2JiQXI1UWl6QTNuSkxVUlYyTTFobGJKeEtVbS9mbkttMVVMYUxSUEFTRGV6aFUzNFM3OUsKSndJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg",
28-
"OpenFn_IMAGE": "openfn/lightning:v2.9.5",
29-
"OpenFn_WORKER_IMAGE": "openfn/ws-worker:latest",
30-
"KAFKA_TRIGGERS_ENABLED": "true",
24+
"OPENFN_POSTGRESQL_DB": "lightning_dev",
25+
"OPENFN_POSTGRESQL_USERNAME": "openfn",
26+
"OPENFN_POSTGRESQL_PASSWORD": "instant101",
27+
"OPENFN_WORKER_LIGHTNING_PUBLIC_KEY": "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUF4SmhzSkVKNGpoNDAvdHN0ZzZxQgpCNnpzQ25VZWhLRUY2QXNkZk4vbG9NVEtaR2kxYS9GRzJsRkFIQng0ZHoyYjRIdEtRZHpJZ1dIY3ZybzkrWTU1Ci9teDd6alhYWHJwVFVCb3JPNUUwQmhESURQdU92SHI1MENoOHhxQWhCMlpmV0ZpdU5Sc2h4UVhzNHEyL0piemoKK2VDa1RQN1lUWWs1Qm9nZnkyaXRsaXF2TFZaSVI2YUlVTy9HOWhwcU85MzZwSngzekdjT0hUZThFcjFqWTN4Kwo3ZENZVTdxSHpNcDdpMFdZQkdoM3kvWUtQcklDbXJCVXpYcUxSUndSZFFObkQ5Z1l5OTRpMmNCMzd0enRkSVBPCklYM2p0b3pJcFgyR2JiQXI1UWl6QTNuSkxVUlYyTTFobGJKeEtVbS9mbkttMVVMYUxSUEFTRGV6aFUzNFM3OUsKSndJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg",
28+
"OPENFN_IMAGE": "openfn/lightning:v2.9.5",
29+
"OPENFN_WORKER_IMAGE": "openfn/ws-worker:latest",
30+
"OPENFN_KAFKA_TRIGGERS_ENABLED": "true",
3131
"OPENFN_API_KEY": "apiKey",
3232
"OPENFN_ENDPOINT": "http://localhost:4000",
33-
"DOCKER_WEB_CPUS": "2",
34-
"DOCKER_WEB_MEMORY": "4G",
35-
"DOCKER_WORKER_CPUS": "2",
36-
"DOCKER_WORKER_MEMORY": "4G",
33+
"OPENFN_DOCKER_WEB_CPUS": "2",
34+
"OPENFN_DOCKER_WEB_MEMORY": "4G",
35+
"OPENFN_DOCKER_WORKER_CPUS": "2",
36+
"OPENFN_DOCKER_WORKER_MEMORY": "4G",
3737
"FHIR_SERVER_BASE_URL": "http://openhim-core:5001",
3838
"FHIR_SERVER_USERNAME": "openfn_client",
3939
"FHIR_SERVER_PASSWORD": "openfn_client_password"

0 commit comments

Comments
 (0)