diff --git a/compose.yaml b/compose.yaml index 275787f24a03b71f445856650c6336c04fbfc3f3..43c5f2823e68a7ebd7b6209ac76218986f35670e 100755 --- a/compose.yaml +++ b/compose.yaml @@ -371,10 +371,10 @@ services: pull_policy: build user: "$USER_ID:$GROUP_ID" volumes: - - "${APP_ROOT}/opencode/.ssh:/home/clover/.ssh" - - "${APP_ROOT}/opencode/.config:/home/clover/.config" - - "${APP_ROOT}/opencode/.local:/home/clover/.local" - - "${APP_ROOT}/opencode/code:/home/clover/code" + - "${APP_ROOT}/opencode/ssh:/home/agent/.ssh" + - "${APP_ROOT}/opencode/config:/home/agent/.config" + - "${APP_ROOT}/opencode/local:/home/agent/.local" + - "${APP_ROOT}/opencode/code:/code" labels: net.paperclover.list.name: OpenCode net.paperclover.list.domain: opencode diff --git a/config/Caddyfile b/config/Caddyfile index 79dfb86b96fddc902b7bb6ddf7f7c6b9ce774e9d..40e835f0426a010b15ec1c49bc98f92595971e76 100644 --- a/config/Caddyfile +++ b/config/Caddyfile @@ -162,7 +162,7 @@ music.{$HOME_DOMAIN} { } } opencode.{$HOME_DOMAIN} { - import reverse_proxy_auth "http://opencode" admin + import reverse_proxy_auth "http://opencode:4096" admin } pg.{$HOME_DOMAIN} { import reverse_proxy_auth "http://pgadmin" admin diff --git a/config/opencode/Dockerfile b/config/opencode/Dockerfile index 97413c0d239d9286293040a80c6bf867ece8ae2e..220d161197e16abca97ed80694567b4408855d98 100755 --- a/config/opencode/Dockerfile +++ b/config/opencode/Dockerfile @@ -14,9 +14,12 @@ RUN dnf update -y && \ unzip \ wget \ zsh \ + g++ \ + && dnf remove nodejs \ && dnf clean all RUN curl -fsSL https://git.paperclover.net/nix/config/src/branch/main/packages/autofmt/autofmt.js -o /usr/local/bin/autofmt && \ chmod +x /usr/local/bin/autofmt +RUN /usr/bin/node # create user RUN groupadd -g 3000 agent && \ @@ -54,4 +57,4 @@ $HOME/.cargo/bin" ENV SHELL=/bin/zsh WORKDIR /code EXPOSE 4096 -CMD ["opencode", "serve", "--hostname", "0.0.0.0"] +CMD ["sh", "-c", "opencode upgrade && opencode serve --hostname 0.0.0.0"]