Add Dev Container config

amacneil · Jul 10, 2024 · ce6e325 · ce6e325
1 parent dbeb393
commit ce6e325
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,6 @@
+{
+  "dockerComposeFile": "../docker-compose.yml",
+  "service": "dev",
+  "workspaceFolder": "/src",
+  "overrideCommand": true
+}
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-# development image
+# development stage
 FROM golang:1.22.5 as dev
 WORKDIR /src
 ENV PATH="/src/typescript/node_modules/.bin:${PATH}"

diff --git a/Makefile b/Makefile
@@ -66,12 +66,15 @@ update-deps:
 		./node_modules/.bin/npm-check-updates --upgrade && \
 		npm install
 
-.PHONY: docker-all
-docker-all:
+.PHONY: docker-build
+docker-build:
 	docker-compose pull --ignore-buildable
 	docker-compose build
+
+.PHONY: docker-all
+docker-all: docker-build
 	docker-compose run --rm dev make all
 
-.PHONY: docker-sh
-docker-sh:
+.PHONY: docker-dev
+docker-dev:
 	-docker-compose run --rm dev