Просмотр исходного кода

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 <noreply@anthropic.com>
create-pull-request/i18n
Slavi Pantaleev 3 часов назад
Родитель
Сommit
fa8c764708
4 измененных файлов: 10 добавлений и 2 удалений
  1. +5
    -1
      .devcontainer/Dockerfile
  2. +0
    -1
      .devcontainer/devcontainer.json
  3. +3
    -0
      .devcontainer/devcontainer.json.license
  4. +2
    -0
      docs/ansible.md

+ 5
- 1
.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 \


+ 0
- 1
.devcontainer/devcontainer.json Просмотреть файл

@@ -1,4 +1,3 @@
// For format details, see https://aka.ms/devcontainer.json.
{
"name": "matrix-docker-ansible-deploy",
"build": {


+ 3
- 0
.devcontainer/devcontainer.json.license Просмотреть файл

@@ -0,0 +1,3 @@
SPDX-FileCopyrightText: 2025 Jonah Aragon

SPDX-License-Identifier: AGPL-3.0-or-later

+ 2
- 0
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:


Загрузка…
Отмена
Сохранить