cachebust for updates

Author: randommm

.github/workflows/docker-image.yml

@@ -2,7 +2,7 @@ name: Docker Image CI
 
 on:
   push:
-    branches: ["master"]
+    branches: [ "master" ]
   schedule:
     - cron: "0 0 * * *"
 
@@ -27,6 +27,7 @@ jobs:
           tags: ghcr.io/${{ github.repository }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+          build-args: CACHEBUST=${{ github.run_id }}
 
       - name: Login to DockerHub
         uses: docker/login-action@v1

Dockerfile

@@ -1,7 +1,5 @@
 FROM docker.io/ubuntu
 
-COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
-
 RUN apt-get update && apt-get install -y --no-install-recommends \
   bash python3 ripgrep \
   git curl wget ca-certificates gnupg \
@@ -13,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   zip unzip tar gzip openssh-client \
   gh vim nano eza fzf shellcheck yamllint \
   docker.io sqlite3 postgresql-client \
-  htop tmux
+  htop tmux clang default-jdk auto-apt-proxy
 
 RUN mkdir -p /etc/apt/keyrings \
   && curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.30/deb/Release.key \
@@ -23,9 +21,16 @@ RUN mkdir -p /etc/apt/keyrings \
   && apt-get update \
   && apt-get install -y --no-install-recommends kubectl
 
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh
+
 RUN curl -fsSL https://opencode.ai/install | bash
 
-ENV PATH="/root/.opencode/bin:${PATH}"
+ENV PATH="/root/.opencode/bin:/root/.local/bin:${PATH}"
+
+ARG CACHEBUST
+RUN echo "CACHEBUST=$CACHEBUST" >/dev/null && \
+  apt-get update && apt-get upgrade -y && \
+  opencode upgrade && uv self update
 
 RUN ln -s /usr/bin/fdfind /usr/local/bin/fd
 

README.md

@@ -8,7 +8,6 @@ Just Opencode in a container with some tools.
 podman run -it --rm \
   -v "$(pwd):/work$(pwd):Z" \
   -w "/work$(pwd)" \
-  -v "$HOME/.opencode:/root/.opencode:Z" \
   -v "$HOME/.local/share/opencode:/root/.local/share/opencode:Z" \
   -v "$HOME/.local/state/opencode:/root/.local/state/opencode:Z" \
   -v "$HOME/.config/opencode:/root/.config/opencode:Z" \
@@ -24,9 +23,17 @@ You might need to create the dirs first:
 
 ```bash
 mkdir -p \
-  $HOME/.opencode \
   $HOME/.local/share/opencode \
   $HOME/.local/state/opencode \
   $HOME/.config/opencode \
   $HOME/.cache/opencode
 ```
+
+You might also want to add more bind to you podman command, e.g.:
+
+```bash
+  -v $HOME/.cache/uv:/root/.cache/uv \
+  -v $HOME/.local/share/uv:/root/.local/share/uv \
+  -v $HOME/.cache/pip:/root/.cache/pip \
+  -v $HOME/.cache/huggingface:/root/.cache/huggingface \
+```