misc: devcontainer docker setup fix

nick · nick · commit fe502da61242 · 2021-10-27T18:44:19.000Z
- Legacy-Id: 19479
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -13,6 +13,7 @@ RUN apt-get -qy upgrade
 
 # Install the packages we need
 RUN apt-get install -qy \
+    bash \
 	build-essential \
 	bzip2 \
 	ca-certificates \
@@ -117,8 +118,9 @@ RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requ
     && rm -rf /tmp/pip-tmp
 
 COPY .devcontainer/init.sh /docker-init.sh
-RUN chmod +x /docker-init.sh
-ENTRYPOINT ["/docker-init.sh"]
+RUN sed -i 's/\r$//' /docker-init.sh && \
+    chmod +x /docker-init.sh
+# ENTRYPOINT ["/usr/local/share/datatracker/.devcontainer/init.sh"]
 CMD	["sleep", "infinity"]
 
 # [Optional] Uncomment this section to install additional OS packages.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -6,6 +6,7 @@
     "service": "app",
     "workspaceFolder": "/usr/local/share/datatracker",
     "shutdownAction": "stopCompose",
+    "postCreateCommand": "/docker-init.sh",
 
 	// Set *default* container specific settings.json values on container create.
 	"settings": { 
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -41,6 +41,23 @@
         "clear": false
       },
       "problemMatcher": []
+    },
+    {
+        "label": "Re-run Setup Project",
+        "type": "shell",
+        "command": "/bin/bash",
+        "args": [
+            "/docker-init.sh"
+        ],
+        "presentation": {
+          "echo": true,
+          "reveal": "always",
+          "focus": true,
+          "panel": "new",
+          "showReuseMessage": false,
+          "clear": false
+        },
+        "problemMatcher": []
     }
   ]
 }
