dymk/pawctioneer-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delta diff tool

Browse Source
This commit is contained in:
Dylan Knutson
2025-08-29 17:34:56 +00:00
parent 83cdbb770d
commit c9acdc9fff
2 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.devcontainer/Dockerfile.devcontainer
View File

@@ -1,6 +1,22 @@
FROM mcr.microsoft.com/devcontainers/rust:1-1-bookworm FROM mcr.microsoft.com/devcontainers/rust:1-1-bookworm
RUN sudo apt update && \ RUN sudo apt update && \
sudo apt install -qqy --no-install-recommends --no-install-suggests sqlite3 && \ sudo apt install -qqy --no-install-recommends --no-install-suggests \
sqlite3 \
&& \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Install & configure delta diff tool
RUN wget -O- https://github.com/dandavison/delta/releases/download/0.18.2/git-delta_0.18.2_$(dpkg --print-architecture).deb > /tmp/git-delta.deb && \
sudo dpkg -i /tmp/git-delta.deb && \
rm /tmp/git-delta.deb
RUN git config --system core.pager "delta" && \
git config --system interactive.diffFilter "delta --color-only" && \
git config --system delta.navigate "true" && \
git config --system delta.dark "true" && \
git config --system delta.side-by-side "true" && \
git config --system merge.conflictstyle "zdiff3" && \
git config --system diff.algorithm "histogram" && \
git config --system diff.colorMoved "default"

37
.devcontainer/devcontainer.json
View File

@@ -1,8 +1,7 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the // For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/rust // README at: https://github.com/devcontainers/templates/tree/main/src/rust
{ {
"name": "Rust", "name": "Pawctioneer Dev Container",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"build": { "build": {
"dockerfile": "Dockerfile.devcontainer", "dockerfile": "Dockerfile.devcontainer",
"context": "." "context": "."
@@ -17,28 +16,24 @@
"customizations": { "customizations": {
"vscode": { "vscode": {
"extensions": [ "extensions": [
"eamodio.gitlens",
"ms-azuretools.vscode-docker",
"qwtel.sqlite-viewer",
"rust-lang.rust-analyzer",
"serayuzgur.crates", "serayuzgur.crates",
"tamasfe.even-better-toml", "tamasfe.even-better-toml"
"eamodio.gitlens"
] ]
} }
}, },
// Use 'mounts' to make the cargo cache persistent in a Docker Volume. "containerEnv": {
// "mounts": [ "GIT_EDITOR": "cursor --wait"
// { },
// "source": "devcontainer-cargo-cache-${devcontainerId}", "mounts": [
// "target": "/usr/local/cargo", {
// "type": "volume" "source": "devcontainer-cargo-cache-${devcontainerId}",
// } "target": "/usr/local/cargo",
// ] "type": "volume"
// Features to add to the dev container. More info: https://containers.dev/features. }
// "features": {}, ],
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "sudo apt update && sudo apt install -y sqlite3" "postCreateCommand": "sudo apt update && sudo apt install -y sqlite3"
// Configure tool-specific properties.
// "customizations": {},
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
} }