Merge pull request #57 from mutablelogic/v1

Updated dockerfile

Author: djthorpe

Makefile

@@ -51,7 +51,7 @@ docker: docker-dep submodule
 		--build-arg OS=${OS} \
 		--build-arg SOURCE=${BUILD_MODULE} \
 		--build-arg VERSION=${VERSION} \
-		-f etc/Dockerfile.${OS}-${ARCH} .
+		-f etc/Dockerfile .
 
 # Test whisper bindings
 test: generate libwhisper libggml

cmd/whisper/main.go

@@ -28,7 +28,7 @@ type CLI struct {
 	Globals
 	Models   ModelsCmd   `cmd:"models" help:"List models"`
 	Download DownloadCmd `cmd:"download" help:"Download a model"`
-	Server   ServerCmd   `cmd:"models" help:"Run the whisper server"`
+	Server   ServerCmd   `cmd:"server" help:"Run the whisper server"`
 }
 
 func main() {

etc/Dockerfile

@@ -0,0 +1,45 @@
+ARG BASE_TAG=0.0.10-4-g6421fd2
+ARG BASE_DEV_CONTAINER=ghcr.io/mutablelogic/cuda-dev:${BASE_TAG}
+ARG BASE_RUN_CONTAINER=ghcr.io/mutablelogic/cuda-rt:${BASE_TAG}
+ARG CUDA_DOCKER_ARCH=all
+ARG GO_VERSION=1.22.5
+ARG ARCH
+ARG OS
+
+# Setup build container
+FROM ${BASE_DEV_CONTAINER} AS build
+ARG CUDA_DOCKER_ARCH
+ARG GO_VERSION
+ARG ARCH
+ARG OS
+
+RUN apt-get -y update \
+ && apt-get -y install software-properties-common curl \
+ && add-apt-repository -y ppa:ubuntuhandbook1/ffmpeg6 \
+ && apt-get -y update \
+ && apt-get -y install libavcodec-dev libavdevice-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev
+
+# Install go
+RUN curl -sL https://golang.org/dl/go${GO_VERSION}.${OS}-${ARCH}.tar.gz | tar -C /usr/local -xz
+ENV PATH=$PATH:/usr/local/go/bin
+
+# Copy source
+WORKDIR /app
+COPY . .
+
+# Make whisper-server
+ENV CUDA_DOCKER_ARCH=${CUDA_DOCKER_ARCH}
+ENV GGML_CUDA=1
+RUN make -j$(nproc)
+
+# Setup runtime container
+FROM ${BASE_RUN_CONTAINER} AS runtime
+COPY --from=build --chmod=755 /app/build/whisper /usr/local/bin/whisper
+COPY --from=build /app/build/whisper /usr/local/bin/whisper
+COPY --chmod=755 etc/entrypoint.sh .
+
+# Entrypoint when running the server
+ENTRYPOINT [ "/entrypoint.sh" ]
+STOPSIGNAL SIGQUIT
+EXPOSE 80
+CMD [ "/usr/local/bin/whisper", "-dir", "/data", "-listen", ":80", "server" ]

etc/Dockerfile.linux-amd64

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ -z "$1" ]; then
+    echo "No command specified"
+    exit 1
+fi
+
+# Create the /alloc/logs folder if it doesn't exist
+install -d -m 0755 /alloc/logs || exit 1
+
+# Create the persistent data folder if it doesn't exist
+install -d -m 0755 /data || exit 1
+
+# Run the command
+set -e
+umask 022
+exec "$@"

etc/Dockerfile.linux-arm64

@@ -1,10 +1,12 @@
 //go:build cuda
+
 package whisper
 
 ///////////////////////////////////////////////////////////////////////////////
 // CGO
 
 /*
-#cgo arm64 pkg-config: cuda-12.2 cublas-12.2 cudart-12.2
+#cgo pkg-config: cuda-12.6 cublas-12.6 cudart-12.6
+#cgo LDFLAGS: -L/usr/local/cuda/lib64/stubs -lcuda
 */
 import "C"