From 86d2c817fc273f7cdc53a3f30c1ca0f9424b4aaa Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Tue, 22 Sep 2026 20:37:47 +0800 Subject: [PATCH] revert opencode to version 1.x --- .gitea/workflows/build-opencode.yaml | 42 ++++++++++++++-------------- opencode/Dockerfile | 9 +++--- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/.gitea/workflows/build-opencode.yaml b/.gitea/workflows/build-opencode.yaml index f114850..db8c7c2 100644 --- a/.gitea/workflows/build-opencode.yaml +++ b/.gitea/workflows/build-opencode.yaml @@ -17,25 +17,25 @@ jobs: registry: gitea.woggioni.net username: woggioni password: ${{ secrets.PUBLISHER_TOKEN }} - # - - # name: Build and push opencode binary images - # uses: docker/build-push-action@v6 - # with: - # builder: multiplatform-builder - # context: "{{defaultContext}}:opencode" - # ssh: default=/var/lib/gitea-runner/.ssh/id_ed25519 - # target: release-bin - # build-args: | - # OPENCODE_VERSION=2.0.12 - # BUN_VERSION=1.4.2 - # platforms: | - # linux/amd64 - # push: true - # pull: true - # tags: | - # "gitea.woggioni.net/woggioni/opencode:2.0.12-bin" - # "gitea.woggioni.net/woggioni/opencode:2.0.12" - # "gitea.woggioni.net/woggioni/opencode:latest" + - + name: Build and push opencode binary images + uses: docker/build-push-action@v6 + with: + builder: multiplatform-builder + context: "{{defaultContext}}:opencode" + ssh: default=/var/lib/gitea-runner/.ssh/id_ed25519 + target: release-bin + build-args: | + OPENCODE_VERSION=1.18.32 + BUN_VERSION=1.4.2 + platforms: | + linux/amd64 + push: true + pull: true + tags: | + "gitea.woggioni.net/woggioni/opencode:1.18.32-bin" + "gitea.woggioni.net/woggioni/opencode:1.18.32" + "gitea.woggioni.net/woggioni/opencode:latest" - name: Build and push opencode build-from-source images uses: docker/build-push-action@v6 @@ -45,11 +45,11 @@ jobs: ssh: default=/var/lib/gitea-runner/.ssh/id_ed25519 target: release build-args: | - OPENCODE_VERSION=2.0.12 + OPENCODE_VERSION=1.18.32 BUN_VERSION=1.4.2 platforms: | linux/amd64 push: true pull: true tags: | - "gitea.woggioni.net/woggioni/opencode:2.0.12-bfs" + "gitea.woggioni.net/woggioni/opencode:1.18.32-bfs" diff --git a/opencode/Dockerfile b/opencode/Dockerfile index ee6c6eb..56ef349 100644 --- a/opencode/Dockerfile +++ b/opencode/Dockerfile @@ -14,12 +14,13 @@ USER builder WORKDIR /home/builder ADD --chown=builder:builder --keep-git-dir=true git@github.com:anomalyco/opencode.git#v${OPENCODE_VERSION} opencode WORKDIR /home/builder/opencode + ENV BUN_COMPILE_RELEASE=bun-v${BUN_VERSION} ENV OPENCODE_CHANNEL=prod ENV OPENCODE_VERSION=${OPENCODE_VERSION} RUN --mount=type=cache,target=/home/builder/.bun/install/cache,uid=1126 bun install -#ADD --chown=builder:builder ./build.ts ./packages/cli/script/build.ts --single -RUN --mount=type=cache,target=/home/builder/.bun/install/cache,uid=1126 ./packages/cli/script/build.ts --single +ADD --chown=builder:builder ./build.ts ./packages/opencode/script/build.ts +RUN --mount=type=cache,target=/home/builder/.bun/install/cache,uid=1126 ./packages/opencode/script/build.ts @@ -40,7 +41,7 @@ RUN echo 'PATH DEFAULT=${HOME}/.local/bin:${HOME}/.cargo/bin:/usr/local/bin:/bin RUN rm repository.key RUN --mount=type=cache,target=/var/cache/pacman pacman -Syu --noconfirm RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \ - xdg-utils rustup rust-analyzer jdtls python-pipx ripgrep git rustup gradle curl sccache openssh \ + xdg-utils rustup rust-analyzer python-pipx ripgrep git rustup gradle curl sccache openssh \ bash-language-server marksman python-lsp-server vscode-css-languageserver x86_64-unknown-linux-musl-zlib x86_64-unknown-linux-musl-gcc \ vscode-html-languageserver vscode-json-languageserver yaml-language-server base-devel docker docker-buildx docker-compose less websocat \ npm gtk3 alsa-lib trunk @@ -49,12 +50,10 @@ RUN useradd -m -d /var/lib/opencode opencode RUN mkdir /workspace RUN chown opencode:opencode /workspace USER opencode -RUN pipx install pyright RUN pipx install pip-tools USER root ADD --chown=opencode:opencode ./opencode.json /etc/opencode/opencode.json RUN mkdir -p /usr/lib/opencode/addons -ADD --chmod=644 https://repo1.maven.org/maven2/org/projectlombok/lombok/1.18.46/lombok-1.18.46.jar /usr/lib/opencode/addons/lombok.jar ENV OPENCODE_CONFIG=/etc/opencode/opencode.json USER opencode WORKDIR /workspace