From 6e5dfa06659bdfa9cc505af805c4e8bd978616ba Mon Sep 17 00:00:00 2001 From: Andrew Maguire Date: Sun, 1 Jan 2023 21:07:33 +0000 Subject: [PATCH 1/9] add minimal devcontainer.json --- .devcontainer/devcontainer.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..ceb31cd1 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,3 @@ +{ + "dockerComposeFile": "docker-compose.yml" +} \ No newline at end of file From 466a9ba1739d99a70ad5cab45b5191971c7e19f0 Mon Sep 17 00:00:00 2001 From: Andrew Maguire Date: Sun, 1 Jan 2023 21:13:32 +0000 Subject: [PATCH 2/9] try proper relative path --- .devcontainer/devcontainer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ceb31cd1..3d114a3e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,3 +1,4 @@ { - "dockerComposeFile": "docker-compose.yml" + "dockerComposeFile": "../docker-compose.yml", + "forwardPorts": [3000] } \ No newline at end of file From 13e5061b95c6e42aad7dde77b6d953bb4a275b20 Mon Sep 17 00:00:00 2001 From: Andrew Maguire Date: Sun, 1 Jan 2023 21:18:58 +0000 Subject: [PATCH 3/9] .yaml instead of .yml --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3d114a3e..203b6add 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,4 +1,4 @@ { - "dockerComposeFile": "../docker-compose.yml", + "dockerComposeFile": "../docker-compose.yaml", "forwardPorts": [3000] } \ No newline at end of file From 229e7c7b0ce5bcb2140f512b27e6c9f4ab3933ea Mon Sep 17 00:00:00 2001 From: Andrew Maguire Date: Sun, 1 Jan 2023 22:23:38 +0000 Subject: [PATCH 4/9] try install docker-compose-plugin --- .devcontainer/devcontainer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 203b6add..22845363 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,4 +1,5 @@ { + "initializeCommand": "apt-get update -y && apt install docker-compose -y && apt install docker-compose-plugin -y", "dockerComposeFile": "../docker-compose.yaml", "forwardPorts": [3000] } \ No newline at end of file From c4b61bf84c838cf7ec8fe9da967375534c0ac6ff Mon Sep 17 00:00:00 2001 From: Andrew Maguire Date: Sun, 1 Jan 2023 22:24:45 +0000 Subject: [PATCH 5/9] apt-get --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 22845363..84b2857c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "initializeCommand": "apt-get update -y && apt install docker-compose -y && apt install docker-compose-plugin -y", + "initializeCommand": "apt-get update -y && apt-get install docker-compose -y && apt-get install docker-compose-plugin -y", "dockerComposeFile": "../docker-compose.yaml", "forwardPorts": [3000] } \ No newline at end of file From 1b081b5641179cc43fbaaaed552172dc4fed4e53 Mon Sep 17 00:00:00 2001 From: Andrew Maguire Date: Sun, 1 Jan 2023 23:28:24 +0000 Subject: [PATCH 6/9] add context to docker compose and service --- .devcontainer/devcontainer.json | 2 +- docker-compose.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 84b2857c..31034fa6 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "initializeCommand": "apt-get update -y && apt-get install docker-compose -y && apt-get install docker-compose-plugin -y", + "service": "web", "dockerComposeFile": "../docker-compose.yaml", "forwardPorts": [3000] } \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index ed72c820..c8d1377e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -87,6 +87,7 @@ services: backend: build: dockerfile: docker/Dockerfile.backend + context: . image: oasst-backend environment: - POSTGRES_HOST=db @@ -103,6 +104,7 @@ services: web: build: dockerfile: docker/Dockerfile.website + context: . image: oasst-web environment: - DATABASE_URL=postgres://postgres:postgres@webdb/oasst_web From 0009f5b5d82064c3e471e578a1c1ed51eadbd788 Mon Sep 17 00:00:00 2001 From: Andrew Maguire Date: Sun, 1 Jan 2023 23:30:48 +0000 Subject: [PATCH 7/9] use `frontend-dev` in devcontainer --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 31034fa6..80f5146c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "service": "web", + "service": "frontend-dev", "dockerComposeFile": "../docker-compose.yaml", "forwardPorts": [3000] } \ No newline at end of file From 30fe045de9e764ff1e35e5c28866e0c6ede6e761 Mon Sep 17 00:00:00 2001 From: Andrew Maguire Date: Sun, 1 Jan 2023 23:52:22 +0000 Subject: [PATCH 8/9] add newline --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 80f5146c..751e896d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,4 +2,4 @@ "service": "frontend-dev", "dockerComposeFile": "../docker-compose.yaml", "forwardPorts": [3000] -} \ No newline at end of file +} From 7956ed0cbe396f1e8c721577c12ccadf2c19b385 Mon Sep 17 00:00:00 2001 From: Andrew Maguire Date: Mon, 2 Jan 2023 15:59:41 +0000 Subject: [PATCH 9/9] try precommit --- .devcontainer/devcontainer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 751e896d..56d18903 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ -{ - "service": "frontend-dev", - "dockerComposeFile": "../docker-compose.yaml", - "forwardPorts": [3000] -} +{ + "service": "frontend-dev", + "dockerComposeFile": "../docker-compose.yaml", + "forwardPorts": [3000] +}