From 320d4391f03fdaca94a3e593f43b06796c0ffb8e Mon Sep 17 00:00:00 2001
From: Perk31e <OfllineWorld@gmail.com>
Date: Fri, 29 May 2026 00:43:00 +0900
Subject: [PATCH] Fix Docker apt-key deprecation and VS Code extension conflict

---
 main.yml                                |  2 +-
 roles/install-tools/tasks/apt-stuff.yml | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/main.yml b/main.yml
index f7883e4b..6442e148 100644
--- a/main.yml
+++ b/main.yml
@@ -16,6 +16,6 @@
             - streetsidesoftware.code-spell-checker
             - ms-python.python
             - DEVSENSE.phptools-vscode
-            - GitHub.copilot
+#            - GitHub.copilot
             - snyk-security.snyk-vulnerability-scanner
 
diff --git a/roles/install-tools/tasks/apt-stuff.yml b/roles/install-tools/tasks/apt-stuff.yml
index 7f0d39c9..ae09bd10 100644
--- a/roles/install-tools/tasks/apt-stuff.yml
+++ b/roles/install-tools/tasks/apt-stuff.yml
@@ -55,18 +55,29 @@
   become: true
   become_method: sudo
 
+- name: "Ensure apt keyrings directory exists"
+  file:
+    path: /etc/apt/keyrings
+    state: directory
+    mode: '0755'
+  become: true
+  become_method: sudo
+
 - name: "Add Docker keyring to apt"
-  apt_key:
+  get_url:
     url: "https://download.docker.com/linux/debian/gpg"
-    state: present
+    dest: /etc/apt/keyrings/docker.asc
+    mode: '0644'
+    force: yes
   become: true
   become_method: sudo
 
 - name: "Install Docker Repository"
   apt_repository:
-    repo: "deb [arch=amd64] https://download.docker.com/linux/debian {{ distribution }} stable"
+    repo: "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian {{ distribution }} stable"
     state: present
     update_cache: yes
+    filename: docker
   become: true
   become_method: sudo