From 666efaf8937bf9bf5a79db47edc7388a08de925c Mon Sep 17 00:00:00 2001 From: cswimr Date: Sun, 26 Jan 2025 22:27:22 +0000 Subject: [PATCH] chore(devcontainer): add DiD, forgejo runner, aliases --- .devcontainer/Dockerfile | 3 +++ .devcontainer/devcontainer.json | 7 ++++++- .devcontainer/home/.bash_aliases | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .devcontainer/home/.bash_aliases diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index c08c396..a14eb43 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,5 +1,6 @@ FROM ghcr.io/astral-sh/uv:0.5.24@sha256:2381d6aa60c326b71fd40023f921a0a3b8f91b14d5db6b90402e65a635053709 AS uv FROM python:3.11-slim@sha256:6ed5bff4d7d377e2a27d9285553b8c21cfccc4f00881de1b24c9bc8d90016e82 AS python +FROM code.forgejo.org/forgejo/runner:6.2.0 AS forgejo-runner FROM mcr.microsoft.com/vscode/devcontainers/base:bookworm@sha256:6155a486f236fd5127b76af33086029d64f64cf49dd504accb6e5f949098eb7e LABEL repository="www.coastalcommits.com/cswimr/SeaCogs" @@ -29,6 +30,8 @@ RUN apt-get update; \ COPY --from=uv --chown=vscode: /uv /uvx /bin/ COPY --from=python --chown=vscode: /usr/local /usr/local +COPY --from=forgejo-runner --chown=vscode: /bin/forgejo-runner /bin/forgejo-runner +COPY --chown=vscode: .devcontainer/home/* /home/vscode/ RUN ln -s /usr/local/bin/python3.11 /usr/local/bin/python; \ python --version; \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 06e81b7..e53bf4c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,6 +4,9 @@ "context": "..", "dockerfile": "Dockerfile" }, + "features": { + "ghcr.io/devcontainers/features/docker-in-docker:2": {} + }, "customizations": { "vscode": { "extensions": [ @@ -29,7 +32,9 @@ "UV_PYTHON_DOWNLOADS": "never", "PROJECT_DIR": "/workspaces/SeaCogs" }, - "mounts": ["source=seacogs-persistent-data,target=/workspaces/SeaCogs/.data,type=volume"], + "mounts": [ + "source=seacogs-persistent-data,target=/workspaces/SeaCogs/.data,type=volume" + ], "postCreateCommand": "uv sync --frozen && sudo chown -R vscode:vscode /workspaces/SeaCogs/.data && uv run redbot-setup --no-prompt --instance-name=local --data-path=/workspaces/SeaCogs/.data --backend=json", "remoteUser": "vscode" } diff --git a/.devcontainer/home/.bash_aliases b/.devcontainer/home/.bash_aliases new file mode 100644 index 0000000..277fc5f --- /dev/null +++ b/.devcontainer/home/.bash_aliases @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +alias runactions="forgejo-runner exec --default-actions-url=https://www.coastalcommits.com --gitea-instance=https://www.coastalcommits.com"