Skip to content

Commit ff7637c

Browse files
committed
Prefix devcontainer so multiple instances are possible
1 parent 40ddd8d commit ff7637c

File tree

4 files changed

+26
-22
lines changed

4 files changed

+26
-22
lines changed

.devcontainer/devcontainer.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
"docker-compose.override.yml"
1212
],
1313
"service": "codespace",
14+
"runArgs": [
15+
"--name",
16+
"${localWorkspaceFolderBasename}-codespace"
17+
],
1418
"runServices": [
1519
"postgres",
1620
"mysql",

.devcontainer/docker-compose.override.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22

33
# Dev Container
44
codespace:
5-
container_name: codespace
5+
container_name: ${COMPOSE_PROJECT_NAME}-codespace
66
build:
77
context: ./
88
dockerfile: .devcontainer/images/devcontainer/Dockerfile

.devcontainer/scripts/codespaces_start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ setupMariadb () {
4646

4747
# Install packages
4848
bundle config set --local with 'debug'
49-
bundle install -j"$(nproc)"
49+
bundle install -j2
5050

5151
# Setup Containers
5252
setupPostgres &

docker-compose.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ services:
22

33
# Postgres
44
postgres:
5-
container_name: postgres
5+
container_name: ${COMPOSE_PROJECT_NAME}-postgres
66
image: postgres:16-alpine
77
environment:
88
POSTGRES_PASSWORD: supersecret
99
command:
1010
# logs every statement sent to the server. Slow, but helpful. Fills up disk Quickly !
1111
- "postgres"
12-
# - "-c"
13-
# - "log_statement=all"
12+
# - "-c"
13+
# - "log_statement=all"
1414
ports:
15-
- "127.0.0.1:5432:5432"
15+
- "5432"
1616
networks:
1717
- cc-net
1818
healthcheck:
@@ -24,12 +24,12 @@ services:
2424

2525
# MySQL
2626
mysql:
27-
container_name: mysql
27+
container_name: ${COMPOSE_PROJECT_NAME}-mysql
2828
image: mysql:8.2
2929
environment:
3030
MYSQL_ROOT_PASSWORD: supersecret
3131
ports:
32-
- "127.0.0.1:3306:3306"
32+
- "3306"
3333
healthcheck:
3434
test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
3535
interval: 10s
@@ -41,12 +41,12 @@ services:
4141

4242
# UAA
4343
uaa:
44-
container_name: uaa
44+
container_name: ${COMPOSE_PROJECT_NAME}-uaa
4545
build:
4646
context: .devcontainer/images/uaa
4747
dockerfile: Dockerfile
4848
ports:
49-
- "127.0.0.1:8080:8080"
49+
- "8080"
5050
healthcheck:
5151
test: [ "CMD", "curl", "-f", "http://localhost:8080/info" ]
5252
interval: 30s
@@ -57,7 +57,7 @@ services:
5757
restart: unless-stopped
5858

5959
diego-api:
60-
container_name: diego-api
60+
container_name: ${COMPOSE_PROJECT_NAME}-diego-api
6161
build:
6262
context: .devcontainer/images/bbs
6363
dockerfile: Dockerfile
@@ -66,18 +66,18 @@ services:
6666
- .devcontainer/images/bbs/locket.json:/bbs/locket.json:ro
6767
- ./spec/fixtures/certs:/bbs/certs:ro
6868
ports:
69-
- "8889:8889"
69+
- "8889"
7070
networks:
7171
- cc-net
7272
restart: unless-stopped
7373

7474
mockserver:
75-
container_name: mockserver
75+
container_name: ${COMPOSE_PROJECT_NAME}-mockserver
7676
build:
7777
context: .devcontainer/images/mockserver
7878
dockerfile: Dockerfile
7979
ports:
80-
- "1234:1234"
80+
- "1234"
8181
environment:
8282
DIEGO_URL: https://diego-api:8889/
8383
DIEGO_CA: /mock/certs/bbs_ca.crt
@@ -91,12 +91,12 @@ services:
9191

9292
# Minio S3 Blobstore
9393
minio:
94-
container_name: minio
94+
container_name: ${COMPOSE_PROJECT_NAME}-minio
9595
image: minio/minio:latest
9696
command: minio server --address ":9001" "/data"
9797
ports:
98-
- "127.0.0.1:9001:9001"
99-
- "127.0.0.1:9000:9000"
98+
- "9001"
99+
- "9000"
100100
environment:
101101
MC_HOST_custom: http://localhost:9001
102102
healthcheck:
@@ -110,13 +110,13 @@ services:
110110

111111
# CATS Configurable Service Broker
112112
catsbroker:
113-
container_name: catsbroker
113+
container_name: ${COMPOSE_PROJECT_NAME}-catsbroker
114114
build:
115115
context: .devcontainer/images/catsbroker
116116
dockerfile: Dockerfile
117117
ports:
118-
- "127.0.0.1:9292:9292"
119-
- "127.0.0.1:9393:80"
118+
- "9292"
119+
- "9393"
120120
healthcheck:
121121
test: [ "CMD", "curl", "-f", "http://localhost:9292/v2/catalog" ]
122122
interval: 30s
@@ -128,14 +128,14 @@ services:
128128

129129
# Nginx Reverse Proxy (For uploads e.g. Packages)
130130
nginx:
131-
container_name: nginx
131+
container_name: ${COMPOSE_PROJECT_NAME}-nginx
132132
build:
133133
context: .devcontainer/images/nginx
134134
dockerfile: Dockerfile
135135
args:
136136
ENABLED_MODULES: nginx_upload_module
137137
ports:
138-
- "0.0.0.0:80:80"
138+
- "80"
139139
networks:
140140
- cc-net
141141
volumes:

0 commit comments

Comments
 (0)