From b67ba0ea854b3f99294e1955bc72d51a81e2d2a2 Mon Sep 17 00:00:00 2001 From: Saninn Salas Diaz <5490201+distante@users.noreply.github.com> Date: Tue, 23 Jan 2024 10:24:30 +0000 Subject: [PATCH] fix(devcontainer): prevent recursive install after create --- .devcontainer/devcontainer.json | 5 +++-- .devcontainer/docker-compose.yml | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index be1e055e..f1551530 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,14 +3,15 @@ { "name": "Nextcloud DevContainer", "dockerComposeFile": ["./docker-compose.yml"], - "service": "nextcloud", + "service": "nextcloud-server", "workspaceFolder": "/var/www/html/custom_apps/memories", // Features to add to the dev container. More info: https://containers.dev/features. "features": {}, // Use 'forwardPorts' to make a list of ports inside the container available locally. // "forwardPorts": [], - "postCreateCommand": "echo 'Container Created'", + "postCreateCommand": "make dev-setup && npx playwright install && npx playwright install-deps", + "postStartCommand": "make watch-js", // Configure tool-specific properties. "customizations": { "vscode": { diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index e827a919..5e280386 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -1,6 +1,6 @@ name: 'nextcloud-with-memories' services: - nextcloud: + nextcloud-server: build: context: . dockerfile: Dockerfile @@ -15,7 +15,6 @@ services: # - theme:/var/www/html/themes/ ports: - 9080:80 - image: nextcloud # volumes: # nextcloud: # name: nextcloud