From 73908fbbcb51a0f1df33f2eea5757c78ccfcf1e8 Mon Sep 17 00:00:00 2001
From: Walter Oggioni <oggioni.walter@gmail.com>
Date: Tue, 27 Jan 2026 21:05:53 +0800
Subject: [PATCH] refactor opencode image for better caching

---
 opencode/Dockerfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/opencode/Dockerfile b/opencode/Dockerfile
index ebbcc63..ece9b82 100644
--- a/opencode/Dockerfile
+++ b/opencode/Dockerfile
@@ -1,5 +1,13 @@
 ARG ALPINE_VERSION=latest
 FROM --platform=$BUILDPLATFORM alpine:${ALPINE_VERSION} AS base
+RUN --mount=type=cache,target=/var/cache/apk apk update
+RUN --mount=type=cache,target=/var/cache/apk apk add rust-analyzer openjdk25-jdk jdtls pipx ripgrep git
+RUN adduser -D -h /var/lib/opencode opencode
+RUN mkdir /workspace
+RUN chown opencode:opencode /workspace
+USER opencode
+RUN pipx install pyright
+USER root
 
 ARG TARGETPLATFORM BUILDPLATFORM OPENCODE_VERSION
 
@@ -10,18 +18,10 @@ FROM base AS builder-linux_amd64
 ADD https://github.com/anomalyco/opencode/releases/download/v${OPENCODE_VERSION}/opencode-linux-x64-musl.tar.gz ./opencode.tgz
 
 FROM builder-${TARGETPLATFORM//\//_} AS release
-
-RUN --mount=type=cache,target=/var/cache/apk apk update
-RUN --mount=type=cache,target=/var/cache/apk apk add rust-analyzer openjdk25-jdk jdtls pipx ripgrep git
 RUN tar -xvf ./opencode.tgz -C /usr/bin
 RUN rm opencode.tgz
-
-RUN adduser -D -h /var/lib/opencode opencode
-RUN mkdir /workspace
-RUN chown opencode:opencode /workspace
 USER opencode
 WORKDIR /workspace
-RUN pipx install pyright
 ENTRYPOINT ["opencode"]
 VOLUME ["/var/lib/opencode", "/workspace"]