From 0d6c1f5c4be1524385b487a3964cc09ac3b871fc Mon Sep 17 00:00:00 2001
From: Joao P Dubas <joao.dubas+gitea@gmail.com>
Date: Tue, 11 Mar 2025 01:26:55 +0000
Subject: [PATCH 1/2] feat(docker): ugprade docker/compose/buildx

* `docker` from 27.3.1 to 28.0.1
* `docker-compose` from v2.29.7 to v2.33.1
* `buildx` from v0.17.1 to v0.21.2
---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index af9d80f..c833490 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -107,11 +107,11 @@ RUN apt-get update \
   && echo 'permit persist :wheel as root' > /etc/doas.conf
 
 # command line utilities
-ENV DO_VERSION 27.3.1
+ENV DO_VERSION 28.0.1
 ENV DO_URL https://download.docker.com/linux/static/stable/x86_64/docker-${DO_VERSION}.tgz
-ENV DC_VERSION v2.29.7
+ENV DC_VERSION v2.33.1
 ENV DC_URL https://github.com/docker/compose/releases/download/${DC_VERSION}/docker-compose-linux-x86_64
-ENV BX_VERSION v0.17.1
+ENV BX_VERSION v0.21.2
 ENV BX_URL https://github.com/docker/buildx/releases/download/${BX_VERSION}/buildx-${BX_VERSION}.linux-amd64
 RUN curl -sS https://starship.rs/install.sh | sh -s -- --yes \
   && mkdir /tmp/download \
-- 
2.47.2


From b2c47a5d8229a77e82fa6425e6278c2fd9dd2c77 Mon Sep 17 00:00:00 2001
From: Joao P Dubas <joao.dubas+gitea@gmail.com>
Date: Fri, 14 Mar 2025 12:05:14 +0000
Subject: [PATCH 2/2] chore(docker): improve env var setup

* Set `GITHUB_TOKEN` based on `GH_TOKEN`
* Enable [`docker buildx bake`][0] as the default engine to build images

[0]: https://docs.docker.com/build/bake/
---
 docker-compose.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8dd6d8d..3423bfa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,9 @@ services:
     command: infinity
     environment:
       ANTHROPIC_API_KEY: ${NVIM_ANTHROPIC_API_KEY:-no-api}
-      GH_TOKEN: ${NVIM_GH_TOKEN:-no-token}
+      GH_TOKEN: &github_token ${NVIM_GH_TOKEN:-no-token}
+      GITHUB_TOKEN: *github_token
+      COMPOSE_BAKE: 'true'
     volumes:
       - './config/atuin:/home/coder/.config/atuin'
       - './config/git:/home/coder/.config/git'
-- 
2.47.2