From 9b29f9b861464a8a0eba78f25058cded118b84d5 Mon Sep 17 00:00:00 2001
From: Idan Gazit <idan@gazit.me>
Date: Thu, 1 Oct 2020 06:52:33 +0000
Subject: [PATCH] Install SSH and GPG into container

Brings back the dockerfile so we can install SSH and GPG into it.
This fixes git actions with SSH remotes, and GPG signing now
works out of the box.

This commit was made from inside the container!
---
 .devcontainer/Dockerfile        | 8 ++++++++
 .devcontainer/devcontainer.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 .devcontainer/Dockerfile

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 00000000..abbe54ac
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,8 @@
+from zmkfirmware/zephyr-west-action-arm
+
+RUN apt-get -y update && \
+	apt-get -y upgrade && \
+    apt-get install --no-install-recommends -y \
+    ssh \
+    gpg && \
+    rm -rf /var/lib/apt/lists/*
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index bbf44bc7..f21465df 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "ZMK Development",
-  "image": "zmkfirmware/zephyr-west-action-arm",
+  "dockerFile": "Dockerfile",
   "extensions": ["ms-vscode.cpptools"],
   "runArgs": ["--security-opt", "label=disable"]
 }