Skip to content

Commit a48d0cf

Browse files
authored
chore(dev): remove unused devcontainers (#58)
1 parent a60e0ad commit a48d0cf

File tree

5 files changed

+17
-59
lines changed

5 files changed

+17
-59
lines changed

.vscode/tasks.json

+2-8
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
{
55
"label": "Start dev container",
66
"type": "shell",
7-
"command": "docker compose --file .devcontainer/docker-compose.yaml up",
8-
"windows": {
9-
"command": "docker compose --file .devcontainer\\docker-compose.yaml up"
10-
},
7+
"command": "docker compose up",
118
"group": "none",
129
"presentation": {
1310
"reveal": "always",
@@ -20,10 +17,7 @@
2017
{
2118
"label": "Stop dev container",
2219
"type": "shell",
23-
"command": "docker compose --file .devcontainer/docker-compose.yaml down",
24-
"windows": {
25-
"command": "docker compose --file .devcontainer\\docker-compose.yaml down"
26-
},
20+
"command": "docker compose down",
2721
"group": "none",
2822
"presentation": {
2923
"reveal": "always",

app/.devcontainer/Dockerfile

-12
This file was deleted.

app/.devcontainer/devcontainer.json

-32
This file was deleted.

app/Dockerfile.dev

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FROM node:18-bullseye
2+
3+
# the root folder will be mounted at /app in the container
4+
WORKDIR /app
5+
6+
# use "node" user with UID/GID 1000 (avoid permission issues with root)
7+
USER node
8+
9+
# install dependencies and run in watch mode
10+
CMD npm install && npm run dev

.devcontainer/docker-compose.yaml docker-compose.yaml

+5-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ services:
2424
depends_on:
2525
- directus-postgres
2626
volumes:
27-
- ../directus:/share
27+
- ./directus:/share
2828
- directus-uploads:/directus/uploads
2929
- directus-extensions:/directus-extensions
3030

@@ -43,23 +43,21 @@ services:
4343
# Build the app service from its folder
4444
build:
4545
# Build context, relative to the current file
46-
context: ../app/.devcontainer
46+
context: ./app
4747
# Path to Dockerfile, relative to context
48-
dockerfile: Dockerfile
49-
args:
50-
VARIANT: ${VARIANT:-18-bullseye}
48+
dockerfile: Dockerfile.dev
5149
environment:
5250
NODE_ENV: development
5351
volumes:
5452
# Bind-mount the app project folder into the container
5553
- type: bind
56-
source: ../app
54+
source: ./app
5755
target: /app
5856

5957
caddy:
6058
image: caddy
6159
volumes:
62-
- "../caddy/Caddyfile.dev:/etc/caddy/Caddyfile"
60+
- "./caddy/Caddyfile.dev:/etc/caddy/Caddyfile"
6361
ports:
6462
- "80:80"
6563

0 commit comments

Comments
 (0)