Fix #1904

32-bit ARM builds

Author: zefhemel

.github/workflows/docker.yml

@@ -9,7 +9,7 @@ on:
       - "*"
 env:
   # Docker & Registries
-  ARCHITECTURES: linux/arm64,linux/amd64
+  ARCHITECTURES: linux/arm64,linux/amd64,linux/arm/v7
   IMAGE_NAME: silverbullet
   WEBSITE_IMAGE: zefhemel/silverbullet-website
   NAMESPACE_GITHUB: silverbulletmd

Dockerfile

@@ -6,7 +6,7 @@ ARG TARGETARCH
 ENV GO_VERSION=1.25.1
 
 # Install Go
-RUN set -e; actual_arch=${TARGETARCH:-$(dpkg --print-architecture)}; wget -P /tmp "https://dl.google.com/go/go${GO_VERSION}.linux-${actual_arch}.tar.gz"; tar -C /usr/local -xzf "/tmp/go${GO_VERSION}.linux-${actual_arch}.tar.gz"; rm "/tmp/go${GO_VERSION}.linux-${actual_arch}.tar.gz"
+RUN set -e; actual_arch=${TARGETARCH:-$(dpkg --print-architecture)}; case "$actual_arch" in arm) actual_arch=armv6l ;; esac; wget -P /tmp "https://dl.google.com/go/go${GO_VERSION}.linux-${actual_arch}.tar.gz"; tar -C /usr/local -xzf "/tmp/go${GO_VERSION}.linux-${actual_arch}.tar.gz"; rm "/tmp/go${GO_VERSION}.linux-${actual_arch}.tar.gz"
 
 ENV GOPATH=/go
 ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH

Makefile

@@ -15,21 +15,23 @@ build:
 build-for-docker: build
 	GOOS=linux GOARCH=arm64 go build -ldflags "$(LDFLAGS)" -o silverbullet-arm64 .
 	GOOS=linux GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o silverbullet-amd64 .
+	GOOS=linux GOARCH=arm GOARM=7 go build -ldflags "$(LDFLAGS)" -o silverbullet-arm .
 
 docker: build-for-docker
-	docker buildx build --platform linux/arm64,linux/amd64 --push .
+	docker buildx build --platform linux/arm64,linux/amd64,linux/arm/v7 --push .
 
 build-server-releases:
 	GOOS=linux GOARCH=arm64 go build -ldflags "$(LDFLAGS)" -o silverbullet . && zip silverbullet-server-linux-aarch64.zip silverbullet
 	GOOS=linux GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o silverbullet . && zip silverbullet-server-linux-x86_64.zip silverbullet
 	GOOS=darwin GOARCH=arm64 go build -ldflags "$(LDFLAGS)" -o silverbullet . && zip silverbullet-server-darwin-aarch64.zip silverbullet
 	GOOS=darwin GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o silverbullet . && zip silverbullet-server-darwin-x86_64.zip silverbullet
 	GOOS=windows GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o silverbullet.exe . && zip silverbullet-server-windows-x86_64.zip silverbullet.exe
+	GOOS=linux GOARCH=arm GOARM=7 go build -ldflags "$(LDFLAGS)" -o silverbullet . && zip silverbullet-server-linux-armv7.zip silverbullet
 	GOOS=freebsd GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o silverbullet . && zip silverbullet-server-freebsd-x86_64.zip silverbullet
 
 clean:
 	rm -rf  client_bundle/{base_fs,client} dist public_version.ts
-	rm -f silverbullet silverbullet-arm64 silverbullet-amd64 silverbullet.exe silverbullet-server-*.zip
+	rm -f silverbullet silverbullet-arm64 silverbullet-amd64 silverbullet-arm silverbullet.exe silverbullet-server-*.zip
 
 check:
 	# Frontend type check

website/Install/Docker.md

@@ -6,8 +6,7 @@ Conveniently, SilverBullet is published as a [docker image on GHCR](https://gith
 
 * 64-bit Intel
 * 64-bit ARM (e.g. for Raspberry Pis and Apple Silicon macs)
-
-There is no 32-bit version of SilverBullet. Most people run 64-bit OSes these days, an exception may be Raspberry Pis. Recent (RPI 3 and later) can run 64-bit Linux as well.
+* 32-bit ARM (ARMv7, e.g. for older Raspberry Pis running 32-bit Linux)
 
 > **warning** Warning
 > To access SilverBullet outside of `localhost` you will need to set up [[TLS]].