Skip to content

Commit a213a67

Browse files
committed
Remove extra services
1 parent 2de7919 commit a213a67

File tree

2 files changed

+2
-56
lines changed

2 files changed

+2
-56
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,7 @@
1616
"ghcr.io/guiyomh/features/vim:0": {}
1717
},
1818
"onCreateCommand": "pip install -e .",
19-
"postStartCommand": "MYSQL_VER=8.0 MINIO_VER=RELEASE.2022-08-11T04-37-28Z docker compose -f ./.devcontainer/local-docker-compose.yml down && MYSQL_VER=8.0 MINIO_VER=RELEASE.2022-08-11T04-37-28Z docker compose -f ./.devcontainer/local-docker-compose.yml up --build --wait",
20-
"forwardPorts": [
21-
80,
22-
443,
23-
3306,
24-
8080,
25-
9000
26-
],
19+
"postStartCommand": "MYSQL_VER=8.0 docker compose -f ./docker/docker-compose.yml down && MYSQL_VER=8.0 docker compose -f ./docker/docker-compose.yml up --build --wait",
2720
"customizations": {
2821
"vscode": {
2922
"extensions": [

docker/docker-compose.yml

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# MYSQL_VER=5.7 MINIO_VER=RELEASE.2022-08-11T04-37-28Z docker compose -f local-docker-compose.yml up --build
1+
# MYSQL_VER=5.7 docker compose -f ./docker/docker-compose.yml up --build
22
version: "2.4"
33
x-net:
44
&net
@@ -10,57 +10,10 @@ services:
1010
image: datajoint/mysql:${MYSQL_VER}
1111
environment:
1212
- MYSQL_ROOT_PASSWORD=${DJ_PASS}
13-
# ports:
14-
# - "3306:3306"
15-
# To persist MySQL data
16-
# volumes:
17-
# - ./mysql/data:/var/lib/mysql
1813
healthcheck:
1914
test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
2015
timeout: 30s
2116
retries: 5
2217
interval: 15s
23-
minio:
24-
<<: *net
25-
image: minio/minio:${MINIO_VER}
26-
environment:
27-
- MINIO_ACCESS_KEY=datajoint
28-
- MINIO_SECRET_KEY=datajoint
29-
# ports:
30-
# - "9000:9000"
31-
# To persist MinIO data and config
32-
# volumes:
33-
# - ./minio/data:/data
34-
# - ./minio/config:/root/.minio
35-
command: server --address ":9000" /data
36-
healthcheck:
37-
test:
38-
[
39-
"CMD",
40-
"curl",
41-
"--fail",
42-
"http://minio:9000/minio/health/live"
43-
]
44-
timeout: 30s
45-
retries: 5
46-
interval: 15s
47-
fakeservices.datajoint.io:
48-
<<: *net
49-
image: datajoint/nginx:v0.2.4
50-
environment:
51-
- ADD_db_TYPE=DATABASE
52-
- ADD_db_ENDPOINT=db:3306
53-
- ADD_minio_TYPE=MINIO
54-
- ADD_minio_ENDPOINT=minio:9000
55-
- ADD_minio_PORT=80 # allow unencrypted connections
56-
- ADD_minio_PREFIX=/datajoint
57-
- ADD_browser_TYPE=MINIOADMIN
58-
- ADD_browser_ENDPOINT=minio:9000
59-
- ADD_browser_PORT=80 # allow unencrypted connections
60-
ports:
61-
- "80:80"
62-
- "443:443"
63-
- "3306:3306"
64-
- "9000:9000"
6518
networks:
6619
main:

0 commit comments

Comments
 (0)