diff --git a/.forgejo/workflows/publish.yaml b/.forgejo/workflows/publish.yaml index 5782bae..e1eb45a 100644 --- a/.forgejo/workflows/publish.yaml +++ b/.forgejo/workflows/publish.yaml @@ -65,7 +65,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v6 with: - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 push: true context: "{{defaultContext}}:${{ matrix.box.path }}" tags: | diff --git a/boxes/devbox/Dockerfile b/boxes/devbox/Dockerfile index ed43e31..d467dc0 100644 --- a/boxes/devbox/Dockerfile +++ b/boxes/devbox/Dockerfile @@ -1,25 +1,20 @@ -FROM rust:alpine AS rust-builder +FROM rust:latest AS rust-builder # setup cargo packages, prefer to use apk packages # to reduce build time and space -RUN \ - --mount=type=cache,target=/var/cache/apk/ \ - --mount=type=cache,target=/app/target/ \ +RUN --mount=type=cache,target=/app/target/ \ --mount=type=cache,target=/usr/local/cargo/git/db \ --mount=type=cache,target=/usr/local/cargo/registry/ \ - apk add bash curl build-base openssl-dev \ - && curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash \ - && cargo binstall --no-confirm \ + curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash \ + && cargo binstall --no-confirm \ + dotter + +FROM ghcr.io/void-linux/void-glibc-full:latest + +# Setup void packages +RUN --mount=type=cache,target=/var/cache/xbps/ \ + xbps-install -Syu \ cocogitto \ - yazi-fm yazi-cli \ - tealdeer - -FROM quay.io/toolbx-images/alpine-toolbox:edge - -# Setup alpine packages -RUN --mount=type=cache,target=/var/cache/apk/ \ - apk update && apk upgrade && apk add \ - build-base \ curl \ fd \ fzf \ @@ -27,12 +22,16 @@ RUN --mount=type=cache,target=/var/cache/apk/ \ lazygit \ neovim \ nushell \ - openssh \ ripgrep \ sd \ starship \ + tealdeer \ tmux \ - tree-sitter-cli \ + tree-sitter \ + void-repo-multilib \ + void-repo-multilib-nonfree \ + void-repo-nonfree \ + yazi \ zoxide \ zsh