From fa8c764708fc2298b4379fb839ac8abc48e95ae0 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sun, 12 Jul 2026 18:36:27 +0300 Subject: [PATCH] Fix up devcontainer config (REUSE, strict JSON, image bump) and mention it in docs - add SPDX licensing information for REUSE compliance - drop the JSONC comment from devcontainer.json, keeping it strict JSON (as required by the check-json pre-commit hook) - bump the base image to the current ghcr.io/devture/ansible release - mention the dev container in docs/ansible.md Co-Authored-By: Claude Fable 5 --- .devcontainer/Dockerfile | 6 +++++- .devcontainer/devcontainer.json | 1 - .devcontainer/devcontainer.json.license | 3 +++ docs/ansible.md | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 .devcontainer/devcontainer.json.license diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 12fef5507..eba808dc1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,8 @@ -FROM ghcr.io/devture/ansible:11.1.0-r0-0 +# SPDX-FileCopyrightText: 2025 Jonah Aragon +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +FROM ghcr.io/devture/ansible:11.6.0-r0-0 # Install additional packages RUN apk add --no-cache \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5cf3a48a1..45b130314 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,4 +1,3 @@ -// For format details, see https://aka.ms/devcontainer.json. { "name": "matrix-docker-ansible-deploy", "build": { diff --git a/.devcontainer/devcontainer.json.license b/.devcontainer/devcontainer.json.license new file mode 100644 index 000000000..5a4ddcde2 --- /dev/null +++ b/.devcontainer/devcontainer.json.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2025 Jonah Aragon + +SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/docs/ansible.md b/docs/ansible.md index fb67c3838..20aee4c58 100644 --- a/docs/ansible.md +++ b/docs/ansible.md @@ -50,6 +50,8 @@ This ensures that: You can either [run Ansible in a container on the Matrix server itself](#running-ansible-in-a-container-on-the-matrix-server-itself) or [run Ansible in a container on another computer (not the Matrix server)](#running-ansible-in-a-container-on-another-computer-not-the-matrix-server). +💡 If you use [Visual Studio Code](https://code.visualstudio.com/) or [GitHub Codespaces](https://github.com/features/codespaces), the playbook also ships a [dev container](https://containers.dev/) configuration (see the `.devcontainer/` directory) based on this same Ansible Docker image, which can prepare such a containerized Ansible environment for you automatically. + ### Running Ansible in a container on the Matrix server itself To run Ansible in a (Docker) container on the Matrix server itself, you need to have a working Docker installation. Docker is normally installed by the playbook, so this may be a bit of a chicken and egg problem. To solve it: