BHEtter container

.devcontainer/devcontainer.json

@@ -1,17 +1,20 @@
 {
-    "name": "Addons Server Development",
-    "dockerComposeFile": ["../docker-compose.yml"],
-    "service": "web",
-    "runServices": ["web", "nginx"],
-    "workspaceFolder": "/data/olympia",
-    "customizations": {},
-    "forwardPorts": ["nginx:80"],
-    "portsAttributes": {
-        "80": {
-            "label": "nginx",
-            "onAutoForward": "notify"
-        }
+  "name": "Addons-Server Devcontainer",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/workspaces",
+  "remoteEnv": {
+    "LOCAL_WORKSPACE_FOLDER": "/workspaces"
+  },
+
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker": {
+      "version": "latest",
+      "enableNonRootDocker": "true",
+      "moby": "true"
     },
-    "initializeCommand": "make up_pre",
-    "postStartCommand": "make initialize"
+    "ghcr.io/jungaretti/features/make:1": {}
+  }
+
+  // "postStartCommand": "make up",
 }

.devcontainer/docker-compose.yml

@@ -0,0 +1,11 @@
+services:
+  app:
+    image: mcr.microsoft.com/devcontainers/base:bullseye
+    working_dir: /workspaces
+    volumes:
+      - ..:/workspaces
+
+    # Overrides default command so things don't shut down after the process ends.
+    entrypoint: /usr/local/share/docker-init.sh
+    command: sleep infinity
+

.github/dependabot.yml

@@ -1,5 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for more information:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://containers.dev/guide/dependabot
+
 version: 2
 updates:
+- package-ecosystem: "devcontainers"
+  directory: "/"
+  schedule:
+    interval: weekly
 - package-ecosystem: "npm"
   directory: "/"
   schedule:

.gitignore

@@ -1,5 +1,5 @@
 *.css.tmp
-.devcontainer
+.devcontainer/*
 *.egg-info
 *.js.tmp
 *.less.css
@@ -54,8 +54,10 @@ tmp/*
 # End of .gitignore. Please keep this in sync with the top section of .dockerignore
 
 # do not ignore the following files
+!.devcontainer/devcontainer.json
+!.devcontainer/docker-compose.yml
+!.devcontainer/Dockerfile
+!deps/.gitkeep
 !docker-compose.private.yml
-!.devcontainer/docker-compose.devcontainer.yml
 !private/README.md
 !storage/.gitignore
-!deps/.gitkeep