backup

Signed-off-by: Andreas Heinrich <[email protected]>

devcontainer/template/.devcontainer/general-devcontainer/docker-compose.yml → devcontainer/template/.devcontainer/docker-compose.yml

@@ -6,47 +6,33 @@ volumes:
   node-red-data:
     external: false
 
-# networks:
-#   default:
-#     external: true
-#     name: infranet_network
-
 services:
-  devcontainer:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    volumes:
-      - ..:/workspace
-    command: sleep infinity
-    depends_on:
-      - mqtt-server
-    environment:
-      MQTT_SERVER_ADRESS: mqtt-server
-      MQTT_SERVER_PORT: 1883
   mqtt-server:
-    image: ghcr.io/everest/everest-dev-environment/mosquitto:refactor/docker-images
+    image: ghcr.io/everest/everest-dev-environment/mosquitto:refactor-docker-images
     ports:
-      - 1883:1883
-      - 9001:9001
+      # allow multiple ports for host to avoid conflicts with other dev environments
+      - 1883-1983:1883
+      - 9001-9101:9001
 
   ocpp-db:
     image: mariadb:10.4.30 # pinned to patch-version because https://github.com/steve-community/steve/pull/1213
     volumes:
       - ocpp-db-data:/var/lib/mysql
     ports:
-      - 13306:3306
+      # allow multiple ports for host to avoid conflicts with other dev environments
+      - 13306-13406:3306
     environment:
       MYSQL_RANDOM_ROOT_PASSWORD: "yes"
       MYSQL_DATABASE: ocpp-db
       MYSQL_USER: ocpp
       MYSQL_PASSWORD: ocpp
 
   steve:
-    build: ghcr.io/everest/everest-dev-environment/steve:refactor/docker-images
+    image: ghcr.io/everest/everest-dev-environment/steve:refactor-docker-images
     ports:
-      - 8180:8180
-      - 8443:8443
+      # allow multiple ports for host to avoid conflicts with other dev environments
+      - 8180-8280:8180
+      - 8443-8543:8443
     depends_on:
       - ocpp-db
 
@@ -57,4 +43,5 @@ services:
     depends_on:
       - mqtt-server
     ports:
-      - 1880:1880 
+      # allow multiple ports for host to avoid conflicts with other dev environments
+      - 1880-1980:1880 

devcontainer/template/.devcontainer/general-devcontainer/Dockerfile

@@ -6,3 +6,15 @@ RUN sudo apt update
 RUN echo "echo \"🏔️ 🚘 Welcome to the EVerest development environment!\"" >> ${HOME}/.bashrc
 RUN echo "echo \"To initialize the EVerest workspace please run the following command:\"" >> ${HOME}/.bashrc
 RUN echo "echo \"edm init main\"" >> ${HOME}/.bashrc
+
+RUN sudo apt install -y --no-install-recommends \
+    python3-sphinx=5.3.0-4
+
+RUN python3 -m pip install --break-system-packages \
+    # Sphinx extensions
+    sphinxcontrib-contentui==0.2.5 \
+    sphinxcontrib-svg2pdfconverter==1.2.2 \
+    # language server RST/Sphinx
+    esbonio==0.16.4 \
+    # Style checker for RST/Sphinx
+    doc8==1.1.1

devcontainer/template/.devcontainer/general-devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
-  "name": "EVerest Debian Devenvironment",
-  "dockerComposeFile": "./docker-compose.yml",
+  "name": "EVerest Debian Devenvironment2",
+  "dockerComposeFile": ["../docker-compose.yml", "./docker-compose.devcontainer.yml"],
   "service": "devcontainer",
   "remoteUser": "docker",
   "workspaceFolder": "/workspace",
@@ -15,13 +15,30 @@
           }
         },
         "terminal.integrated.defaultProfile.linux": "bash",
-        "python.pythonPath": "/usr/bin/python3"
+        "python.pythonPath": "/usr/bin/python3",
+        "python.defaultInterpreterPath": "/usr/bin/python3",
+        "editor.rulers": [79, 120],
+        // RST/Sphinx language server
+        "esbonio.sphinx.buildDir": "${workspaceFolder}/everest/docs/_build",
+        "esbonio.sphinx.confDir": "${workspaceFolder}/everest/docs",
+        // RST
+        "restructuredtext.preview.scrollEditorWithPreview": false,
+        "restructuredtext.pythonRecommendation.disabled": true,
+        "liveServer.settings.root": "/everest/docs/_build/html"
       },
       "extensions": [
-        "ms-python.python",
+        // language support CPP
         "ms-vscode.cpptools",
+        // language support cmake
         "twxs.cmake",
-        "ms-vscode.cmake-tools"
+        "ms-vscode.cmake-tools",
+				// language support python
+				"ms-python.python",
+				// language support restructured text
+				"lextudio.restructuredtext",
+				"trond-snekvik.simple-rst",
+				// doc live server
+				"ritwickdey.liveserver"
       ]
     }
   }

devcontainer/template/.devcontainer/general-devcontainer/docker-compose.devcontainer.yml

@@ -0,0 +1,15 @@
+version: "3.6"
+
+services:
+  devcontainer:
+    build:
+      context: ./general-devcontainer
+      dockerfile: Dockerfile
+    volumes:
+      - type: bind
+        source: ..
+        target: /workspace
+    command: sleep infinity
+    environment:
+      MQTT_SERVER_ADRESS: mqtt-server
+      MQTT_SERVER_PORT: 1883