From 038bf4fb09c0b7df62d471bf5c58f809d3634f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Rom=C3=A1n?= <cesar@coatl.dev>
Date: Mon, 26 Aug 2024 07:57:10 -0700
Subject: [PATCH] chore(devcontainer): move files to .devcontainer dir (#299)

---
 Dockerfile => .devcontainer/Dockerfile                | 4 ++--
 .devcontainer.json => .devcontainer/devcontainer.json | 3 ++-
 .editorconfig                                         | 7 ++++---
 3 files changed, 8 insertions(+), 6 deletions(-)
 rename Dockerfile => .devcontainer/Dockerfile (66%)
 rename .devcontainer.json => .devcontainer/devcontainer.json (94%)

diff --git a/Dockerfile b/.devcontainer/Dockerfile
similarity index 66%
rename from Dockerfile
rename to .devcontainer/Dockerfile
index 30238752..f0997344 100644
--- a/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/ignition-devs/devcontainer-base:python as devcontainer
+FROM quay.io/ignition-devs/devcontainer-base:python
 
 COPY requirements.txt /tmp/requirements.txt
 
@@ -8,4 +8,4 @@ RUN set -eux; \
     python2 -m pip install --requirement \
         /tmp/requirements.txt
 
-CMD ["/bin/bash"]
+CMD ["/bin/bash"]
\ No newline at end of file
diff --git a/.devcontainer.json b/.devcontainer/devcontainer.json
similarity index 94%
rename from .devcontainer.json
rename to .devcontainer/devcontainer.json
index bf575dc9..2242561b 100644
--- a/.devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,7 @@
 {
   "name": "ignition-api-8.1",
   "build": {
+    "context": "..",
     "dockerfile": "Dockerfile"
   },
   "customizations": {
@@ -15,4 +16,4 @@
     }
   },
   "onCreateCommand": "pre-commit install && pre-commit install --hook-type commit-msg"
-}
+}
\ No newline at end of file
diff --git a/.editorconfig b/.editorconfig
index bfe45817..048467a6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,15 +5,16 @@ root = true
 
 [*]
 end_of_line = lf
-insert_final_newline = true
 trim_trailing_whitespace = true
 
-[{*.md,*.yaml,*.yml}]
+[*.{md,toml,yaml,yml}]
 indent_style = space
 indent_size = 2
+insert_final_newline = true
 x-soft-wrap-text = true
 
-[*.py]
+[*.{ini,py}]
 charset = utf-8
 indent_style = space
+insert_final_newline = true
 indent_size = 4