Refactor Dev Container setup & Dockerfile

- Symlink `/.devcontainer/devcontainer.json` => `/.devcontainer.json`. - Symlink `/Dockerfile` => `/.devcontainer/Dockerfile`. - Add `ps` command to `Dockerfile` for JetBrains to function. - Sort packages in `Dockerfile` Signed-off-by: Dom Rodriguez <[email protected]>
pine64 · May 12, 2024 · 9053594 · 9053594
1 parent 0751b1c
commit 9053594
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/.devcontainer.json b/.devcontainer.json
@@ -0,0 +1 @@
+.devcontainer/devcontainer.json
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -0,0 +1 @@
+../Dockerfile
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,8 +1,8 @@
 {
 	"name": "Open PineBuds Pro - VS Code Development Environment",
+	"image": "ghcr.io/pine64/openpinebuds:latest-sdk",
 	"build": {
-		"dockerfile": "../Dockerfile",
-		"context": ".."
+		"build": "Dockerfile"
 	},
 	"extensions": [
 		"ms-vscode.cmake-tools",
@@ -13,4 +13,4 @@
 	],
 	"userEnvProbe": "loginInteractiveShell",
 	"remoteUser": "root"
-}
+}
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,7 @@
 !.mailmap
 !.github
 !.devcontainer
+!.devcontainer.json
 
 # Backup files
 *~

diff --git a/Dockerfile b/Dockerfile
@@ -29,11 +29,12 @@ RUN apt-get update \
     bash \
     bc \
     bzip2 \
+    clang-format \ 
     curl \
     ffmpeg \
-    clang-format \ 
     git \
     make \
+    procps \
     tar \
     xxd \
     && git config --global --add safe.directory /src \
@@ -50,4 +51,4 @@ ENV PATH="${PATH}:/src/gcc-arm-none-eabi-9-2019-q4-major/bin"
 COPY --from=rust_build /usr/src/bestool/bestool/target/release/bestool /usr/local/bin/bestool
 COPY . /usr/src
 
-ENTRYPOINT ["/bin/bash"]
+ENTRYPOINT ["/bin/bash", "-l", "-c"]