diff --git a/devcontainer.json b/devcontainer.json
new file mode 100644
index 0000000..f713571
--- /dev/null
+++ b/devcontainer.json
@@ -0,0 +1,24 @@
+{
+	"name": "Go environment",
+	"dockerComposeFile": "docker-compose.yml",
+	"service": "app",
+	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+	"forwardPorts": [5432, 8000],
+	"remoteUser": "vscode",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"golang.go",
+				"neonxp.gotools",
+				"r3inbowari.gomodexplorer",
+				"ms-vscode.makefile-tools",
+				"redhat.vscode-yaml",
+				"humao.rest-client",
+				"mtxr.sqltools",
+				"mtxr.sqltools-driver-pg",
+				"codezombiech.gitignore",
+				"ms-azuretools.vscode-docker"
+			]
+		}
+	}
+}
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..4a959ae
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,24 @@
+version: '3.8'
+
+volumes:
+  postgres-data:
+
+services:
+  app:
+    build: 
+      context: .
+      dockerfile: Dockerfile
+    env_file:
+        - .env
+    volumes:
+      - ../..:/workspaces:cached
+    command: sleep infinity
+    network_mode: service:db
+
+  db:
+    image: postgres:15-alpine3.17
+    restart: unless-stopped
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    env_file:
+      - .env