Skip to content

Commit 66fd136

Browse files
committed
chore: remove infrahub.toml
1 parent 2e3cdca commit 66fd136

File tree

4 files changed

+33
-5
lines changed

4 files changed

+33
-5
lines changed

.dockerignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ frontend/**/playwright-report
2525

2626
# Generated files
2727
generated/
28-
query_performance_results/
28+
query_performance_results/
29+
**/infrahub.toml

development/docker-compose-test-scale.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,20 @@ services:
103103
- "${INFRAHUB_SERVER_PORT:-8000}:8000"
104104
environment:
105105
<<: *infrahub_config
106-
INFRAHUB_CONFIG: /source/development/infrahub.toml
107106
INFRAHUB_PRODUCTION: false
108107
INFRAHUB_LOG_LEVEL: INFO
109108
INFRAHUB_INITIAL_ADMIN_TOKEN: 06438eb2-8019-4776-878c-0941b1f1d1ec
110109
INFRAHUB_SECURITY_SECRET_KEY: 327f747f-efac-42be-9e73-999f08f86b92
111110
INFRAHUB_BROKER_ADDRESS: message-queue
112111
INFRAHUB_CACHE_ADDRESS: "${INFRAHUB_CACHE_ADDRESS:-cache}"
112+
INFRAHUB_INTERNAL_ADDRESS: "http://infrahub-server:8000"
113+
INFRAHUB_GIT_REPOSITORIES_DIRECTORY: "/opt/infrahub/git"
114+
INFRAHUB_DB_ADDRESS: database
115+
INFRAHUB_DB_USERNAME: neo4j
116+
INFRAHUB_DB_PASSWORD: admin
117+
INFRAHUB_DB_PORT: 7687
118+
INFRAHUB_DB_PROTOCOL: bolt
119+
INFRAHUB_STORAGE_DRIVER: local
113120
volumes:
114121
- ../:/source
115122
- "storage_data:/opt/infrahub/storage"

development/docker-compose-test.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,19 @@ services:
9393
environment:
9494
<<: *infrahub_config
9595
INFRAHUB_BUILD_NAME:
96-
INFRAHUB_CONFIG: /source/development/infrahub.toml
9796
INFRAHUB_PRODUCTION: false
9897
INFRAHUB_LOG_LEVEL: CRITICAL
9998
INFRAHUB_TEST_IN_DOCKER: 1
10099
INFRAHUB_BROKER_ADDRESS: message-queue
101100
INFRAHUB_CACHE_ADDRESS: "${INFRAHUB_CACHE_ADDRESS:-cache}"
101+
INFRAHUB_INTERNAL_ADDRESS: "http://infrahub-server:8000"
102+
INFRAHUB_GIT_REPOSITORIES_DIRECTORY: "/opt/infrahub/git"
103+
INFRAHUB_DB_ADDRESS: database
104+
INFRAHUB_DB_USERNAME: neo4j
105+
INFRAHUB_DB_PASSWORD: admin
106+
INFRAHUB_DB_PORT: 7687
107+
INFRAHUB_DB_PROTOCOL: bolt
108+
INFRAHUB_STORAGE_DRIVER: local
102109
volumes:
103110
- ../:/source
104111
tty: true

development/docker-compose.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,19 @@ services:
113113
condition: service_healthy
114114
environment:
115115
<<: *infrahub_config
116-
INFRAHUB_CONFIG: /source/development/infrahub.toml
116+
INFRAHUB_INTERNAL_ADDRESS: "http://infrahub-server:8000"
117+
INFRAHUB_GIT_REPOSITORIES_DIRECTORY: "/opt/infrahub/git"
117118
INFRAHUB_PRODUCTION: false
118119
INFRAHUB_INITIAL_ADMIN_TOKEN: 06438eb2-8019-4776-878c-0941b1f1d1ec
119120
INFRAHUB_SECURITY_SECRET_KEY: 327f747f-efac-42be-9e73-999f08f86b92
120121
INFRAHUB_BROKER_ADDRESS: message-queue
121122
INFRAHUB_CACHE_ADDRESS: "${INFRAHUB_CACHE_ADDRESS:-cache}"
123+
INFRAHUB_DB_ADDRESS: database
124+
INFRAHUB_DB_USERNAME: neo4j
125+
INFRAHUB_DB_PASSWORD: admin
126+
INFRAHUB_DB_PORT: 7687
127+
INFRAHUB_DB_PROTOCOL: bolt
128+
INFRAHUB_STORAGE_DRIVER: local
122129
volumes:
123130
- "storage_data:/opt/infrahub/storage"
124131
tty: true
@@ -147,14 +154,20 @@ services:
147154
- infrahub-server
148155
environment:
149156
<<: *infrahub_config
150-
INFRAHUB_CONFIG: /source/development/infrahub.toml
151157
INFRAHUB_ADDRESS: http://infrahub-server:8000
158+
INFRAHUB_INTERNAL_ADDRESS: "http://infrahub-server:8000"
152159
INFRAHUB_PRODUCTION: false
153160
INFRAHUB_LOG_LEVEL: DEBUG
154161
INFRAHUB_API_TOKEN: 06438eb2-8019-4776-878c-0941b1f1d1ec
155162
INFRAHUB_TIMEOUT: 20
156163
INFRAHUB_BROKER_ADDRESS: message-queue
157164
INFRAHUB_CACHE_ADDRESS: "${INFRAHUB_CACHE_ADDRESS:-cache}"
165+
INFRAHUB_DB_ADDRESS: database
166+
INFRAHUB_DB_USERNAME: neo4j
167+
INFRAHUB_DB_PASSWORD: admin
168+
INFRAHUB_DB_PORT: 7687
169+
INFRAHUB_DB_PROTOCOL: bolt
170+
INFRAHUB_STORAGE_DRIVER: local
158171
volumes:
159172
- "git_data:/opt/infrahub/git"
160173
- "git_remote_data:/remote"

0 commit comments

Comments
 (0)