homelab/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2026-08-07 10:04:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

dev: bump dev image to trixie (#7968)

Browse Source
This commit is contained in:
Michael Genson
2026-07-28 09:46:48 -05:00
committed by GitHub
parent 1eea0254a3
commit 472f652c65
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.devcontainer/Dockerfile
+2 -1
View File
@@ -1,5 +1,5 @@
# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster # [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster
ARG VARIANT="3.12-bullseye" ARG VARIANT="3.12-trixie"
FROM mcr.microsoft.com/devcontainers/python:${VARIANT} FROM mcr.microsoft.com/devcontainers/python:${VARIANT}
# Remove outdated yarn GPG key, if it exists # Remove outdated yarn GPG key, if it exists
@@ -13,6 +13,7 @@ RUN echo "export PROMPT_COMMAND='history -a'" >> /home/vscode/.bashrc \
&& echo "export HISTFILE=~/commandhistory/.bash_history" >> /home/vscode/.bashrc \ && echo "export HISTFILE=~/commandhistory/.bash_history" >> /home/vscode/.bashrc \
&& chown vscode:vscode -R /home/vscode/ && chown vscode:vscode -R /home/vscode/
RUN npm install -g yarn
RUN npm install -g @go-task/cli RUN npm install -g @go-task/cli
RUN npm install -g json-schema-to-typescript RUN npm install -g json-schema-to-typescript
.devcontainer/devcontainer-lock.json
+4 -4
View File
@@ -1,9 +1,9 @@
{ {
"features": { "features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": { "ghcr.io/devcontainers/features/docker-in-docker:4": {
"version": "2.17.0", "version": "4.0.0",
"resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:25b9f05705ffba7dbe503230ac76081419306f8c8bc88e0ce78c4ecd99a0c78c", "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:4fa87399214366e320d489991769c4f3f461e1ffe461f54eea78a41b34945bb5",
"integrity": "sha256:25b9f05705ffba7dbe503230ac76081419306f8c8bc88e0ce78c4ecd99a0c78c" "integrity": "sha256:4fa87399214366e320d489991769c4f3f461e1ffe461f54eea78a41b34945bb5"
}, },
"ghcr.io/devcontainers/features/github-cli:1": { "ghcr.io/devcontainers/features/github-cli:1": {
"version": "1.1.0", "version": "1.1.0",
.devcontainer/devcontainer.json
+4 -3
View File
@@ -9,7 +9,7 @@
// Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6 // Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6
// Append -bullseye or -buster to pin to an OS version. // Append -bullseye or -buster to pin to an OS version.
// Use -bullseye variants on local on arm64/Apple Silicon. // Use -bullseye variants on local on arm64/Apple Silicon.
"VARIANT": "3.12-bullseye", "VARIANT": "3.12-trixie",
// Options // Options
"NODE_VERSION": "22" "NODE_VERSION": "22"
} }
@@ -54,8 +54,9 @@
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode", "remoteUser": "vscode",
"features": { "features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": { "ghcr.io/devcontainers/features/docker-in-docker:4": {
"dockerDashComposeVersion": "v2" "dockerDashComposeVersion": "v2",
"moby": false
}, },
"ghcr.io/devcontainers/features/github-cli:1": {} "ghcr.io/devcontainers/features/github-cli:1": {}
}, },