Skip to content

Commit e5dddc7

Browse files
committed
refactor(docker): remove unused database service configurations and update test command
1 parent ad48b86 commit e5dddc7

2 files changed

Lines changed: 9 additions & 210 deletions

File tree

docker-compose.tst.yml

Lines changed: 3 additions & 209 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,9 @@ services:
1717
condition: service_healthy
1818
testPg-e2e-testing:
1919
condition: service_healthy
20-
mssql-e2e-testing:
21-
condition: service_healthy
22-
test-oracle-e2e-testing:
23-
condition: service_healthy
24-
test-ibm-db2-e2e-testing:
25-
condition: service_healthy
26-
test-mongo-e2e-testing:
27-
condition: service_healthy
28-
test-dynamodb-e2e-testing:
29-
condition: service_healthy
30-
test-redis-e2e-testing:
31-
condition: service_healthy
32-
test-cassandra-e2e-testing:
33-
condition: service_healthy
34-
test-clickhouse-e2e-testing:
35-
condition: service_healthy
36-
test-elasticsearch-e2e-testing:
37-
condition: service_healthy
38-
command: ["/bin/sh", "-c", "pnpm test-all-parallel $EXTRA_ARGS"]
20+
# $EXTRA_ARGS is a single ava glob (quoted so the extglob reaches ava
21+
# intact instead of being expanded by the container's dash shell).
22+
command: ["/bin/sh", "-c", "pnpm test-all-parallel \"$EXTRA_ARGS\""]
3923
develop:
4024
watch:
4125
- action: rebuild
@@ -73,23 +57,6 @@ services:
7357
retries: 10
7458
start_period: 10s
7559

76-
test-mongo-e2e-testing:
77-
image: mongo
78-
restart: always
79-
environment:
80-
MONGO_INITDB_ROOT_USERNAME: root
81-
MONGO_INITDB_ROOT_PASSWORD: example
82-
ports:
83-
- 27017:27017
84-
tmpfs:
85-
- /data/db
86-
healthcheck:
87-
test: [ "CMD", "mongosh", "--eval", "db.adminCommand('ping')" ]
88-
interval: 10s
89-
timeout: 5s
90-
retries: 10
91-
start_period: 30s
92-
9360
postgres:
9461
image: postgres
9562
ports:
@@ -106,44 +73,6 @@ services:
10673
retries: 10
10774
start_period: 10s
10875

109-
mssql-e2e-testing:
110-
image: mcr.microsoft.com/mssql/server:2019-latest
111-
environment:
112-
- SA_PASSWORD=yNuXf@6T#BgoQ%U6knMp
113-
- ACCEPT_EULA=Y
114-
ports:
115-
- "5434:1433"
116-
tmpfs:
117-
- /var/opt/mssql
118-
healthcheck:
119-
test:
120-
[
121-
"CMD-SHELL",
122-
"/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P
123-
'yNuXf@6T#BgoQ%U6knMp' -C -Q 'SELECT 1' ||
124-
/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P
125-
'yNuXf@6T#BgoQ%U6knMp' -Q 'SELECT 1'",
126-
]
127-
interval: 10s
128-
timeout: 5s
129-
retries: 20
130-
start_period: 60s
131-
132-
test-oracle-e2e-testing:
133-
image: gvenzl/oracle-xe
134-
ports:
135-
- 1521:1521
136-
environment:
137-
ORACLE_PASSWORD: 12345
138-
tmpfs:
139-
- /opt/oracle/oradata
140-
healthcheck:
141-
test: [ "CMD-SHELL", "healthcheck.sh" ]
142-
interval: 10s
143-
timeout: 5s
144-
retries: 30
145-
start_period: 120s
146-
14776
autoadmin-ws-server:
14877
build:
14978
context: autoadmin-ws-server
@@ -157,138 +86,3 @@ services:
15786
- backend
15887
depends_on:
15988
- backend
160-
test-cassandra-e2e-testing:
161-
image: cassandra:5.0.4
162-
environment:
163-
- CASSANDRA_CLUSTER_NAME=TestCluster
164-
- CASSANDRA_DC=TestDC
165-
- CASSANDRA_RACK=TestRack
166-
- MAX_HEAP_SIZE=768M
167-
- HEAP_NEWSIZE=128M
168-
mem_limit: 3g
169-
restart: always
170-
healthcheck:
171-
test:
172-
[
173-
"CMD",
174-
"cqlsh",
175-
"-u",
176-
"cassandra",
177-
"-p",
178-
"cassandra",
179-
"-e",
180-
"describe keyspaces",
181-
]
182-
interval: 30s
183-
timeout: 10s
184-
retries: 5
185-
start_period: 60s
186-
187-
test-redis-e2e-testing:
188-
image: redis:7.0.11
189-
command: [ "redis-server", "--requirepass", "SuperSecretRedisPassword" ]
190-
tmpfs:
191-
- /data
192-
healthcheck:
193-
test: [ "CMD", "redis-cli", "ping" ]
194-
interval: 30s
195-
timeout: 10s
196-
retries: 3
197-
198-
test-ibm-db2-e2e-testing:
199-
image: icr.io/db2_community/db2
200-
restart: always
201-
privileged: true
202-
environment:
203-
- LICENSE=accept
204-
- DB2INSTANCE=db2inst1
205-
- DB2INST1_PASSWORD=password
206-
- DBNAME=testdb
207-
- BLU=false
208-
- ENABLE_ORACLE_COMPATIBILITY=false
209-
- UPDATEAVAIL=NO
210-
- TO_CREATE_SAMPLEDB=true
211-
- REPODB=false
212-
- IS_OSXFS=false
213-
- PERSISTENT_HOME=true
214-
- HADR_ENABLED=false
215-
- ETCD_ENDPOINT=
216-
- ETCD_USERNAME=
217-
- ETCD_PASSWORD=
218-
ports:
219-
- 50000:50000
220-
healthcheck:
221-
test: [ "CMD-SHELL", "su - db2inst1 -c 'db2 connect to testdb'" ]
222-
interval: 30s
223-
timeout: 30s
224-
retries: 20
225-
start_period: 180s
226-
227-
test-dynamodb-e2e-testing:
228-
image: amazon/dynamodb-local
229-
environment:
230-
- AWS_ACCESS_KEY_ID=SuperSecretAwsAccessKey
231-
- AWS_SECRET=SuperSecretAwsSecret
232-
healthcheck:
233-
test: [ "CMD-SHELL", "curl -s http://localhost:8000 || exit 1" ]
234-
interval: 10s
235-
timeout: 5s
236-
retries: 10
237-
start_period: 10s
238-
239-
test-clickhouse-e2e-testing:
240-
image: clickhouse/clickhouse-server:24.8
241-
restart: unless-stopped
242-
ports:
243-
- 8123:8123
244-
- 9000:9000
245-
environment:
246-
- CLICKHOUSE_DB=testdb
247-
- CLICKHOUSE_USER=default
248-
- CLICKHOUSE_PASSWORD=clickhouse_password
249-
- CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=1
250-
tmpfs:
251-
- /var/lib/clickhouse
252-
ulimits:
253-
nofile:
254-
soft: 262144
255-
hard: 262144
256-
healthcheck:
257-
test:
258-
[
259-
"CMD",
260-
"clickhouse-client",
261-
"--user=default",
262-
"--password=clickhouse_password",
263-
"--query=SELECT 1",
264-
]
265-
interval: 10s
266-
timeout: 5s
267-
retries: 20
268-
start_period: 60s
269-
270-
test-elasticsearch-e2e-testing:
271-
image: docker.elastic.co/elasticsearch/elasticsearch:8.15.0
272-
environment:
273-
- discovery.type=single-node
274-
- xpack.security.enabled=true
275-
- ELASTIC_PASSWORD=SuperSecretElasticPassword
276-
- ES_JAVA_OPTS=-Xms512m -Xmx512m
277-
ports:
278-
- 9200:9200
279-
tmpfs:
280-
- /usr/share/elasticsearch/data
281-
ulimits:
282-
memlock:
283-
soft: -1
284-
hard: -1
285-
healthcheck:
286-
test:
287-
[
288-
"CMD-SHELL",
289-
"curl -s -u elastic:SuperSecretElasticPassword http://localhost:9200/_cluster/health | grep -E '\"status\":\"(green|yellow)\"'",
290-
]
291-
interval: 10s
292-
timeout: 5s
293-
retries: 20
294-
start_period: 60s

justfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
test args='test/ava-tests/non-saas-tests/*':
1+
# CI default runs only the Postgres + MySQL (and DB-agnostic) suites — the
2+
# other database engines (Oracle, MSSQL, Mongo, IBM DB2, Cassandra, Redis,
3+
# DynamoDB, ClickHouse, Elasticsearch) are excluded so their heavy containers
4+
# aren't needed. Pass an explicit glob to run a different subset locally, e.g.
5+
# just test 'test/ava-tests/non-saas-tests/*mongo*.test.ts'
6+
test args='test/ava-tests/non-saas-tests/!(*oracle*|*ibmdb2*|*cassandra*|*elasticsearch*|*mssql*|*mongo*|*redis*|*dynamodb*|*clickhouse*).test.ts':
27
EXTRA_ARGS="{{args}}" docker compose -f docker-compose.tst.yml up --abort-on-container-exit --force-recreate --build --attach=backend --no-log-prefix

0 commit comments

Comments
 (0)