From 83d1330c00bd1867f847586d514a0d428780700b Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 6 Jan 2025 16:46:44 +0000 Subject: [PATCH] Fix paths --- .devcontainer.json | 1 + .devcontainer/devcontainer.json | 1 - .devcontainer/docker-compose.yml | 3 +-- 3 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 .devcontainer.json diff --git a/.devcontainer.json b/.devcontainer.json new file mode 100644 index 00000000..27dc5b1f --- /dev/null +++ b/.devcontainer.json @@ -0,0 +1 @@ +{"image":"mcr.microsoft.com/devcontainers/base:ubuntu"} \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f3c8acb0..ddd3b375 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,7 +6,6 @@ // Update the 'dockerComposeFile' list if you have more compose files or use different names. // The .devcontainer/docker-compose.yml file contains any overrides you need/want to make. "dockerComposeFile": [ - "../docker-compose.yml", "docker-compose.yml" ], diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index c0bdc254..01eb20cc 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -2,7 +2,7 @@ services: web: build: context: . - dockerfile: containers/php/Dockerfile + dockerfile: Dockerfile volumes: - ./sfiab:/var/www/html/sfiab:rw ports: @@ -21,6 +21,5 @@ services: - 3306:3306 volumes: - db_data:/var/lib/mysql - - ../sfiab_sudbury.sql:/sfiab_sudbury.sql volumes: db_data: