fix dockerfile

Signed-off-by: Maroon Ayoub <[email protected]>

Author: vMaroon

Dockerfile

@@ -17,12 +17,10 @@ FROM quay.io/projectquay/golang:1.24 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 
-ENV GOPROXY=https://goproxy.io,direct
-
 WORKDIR /workspace
 
 USER root
-RUN dnf install -y gcc-c++ libstdc++ libstdc++-devel && dnf clean all
+RUN dnf install -y gcc-c++ libstdc++ libstdc++-devel clang && dnf clean all
 
 # Copy the Go Modules manifests
 COPY go.mod go.mod
@@ -35,6 +33,11 @@ RUN go mod download
 COPY examples/kv-cache-index/main.go cmd/cmd.go
 COPY . .
 
+# HuggingFace tokenizer bindings
+RUN mkdir -p lib
+RUN curl -L https://github.com/daulet/tokenizers/releases/download/v1.20.2/libtokenizers.${TARGETOS}-${TARGETARCH}.tar.gz | tar -xz -C lib
+RUN ranlib lib/*.a
+
 # Build
 # the GOARCH has not a default value to allow the binary be built according to the host where the command
 # was called. For example, if we call make image-build in a local env which has the Apple Silicon M1 SO

Makefile

@@ -12,7 +12,7 @@ TARGETOS ?= $(shell go env GOOS)
 TARGETARCH ?= $(shell go env GOARCH)
 
 TOOLS_DIR := $(shell pwd)/hack/tools
-CONTAINER_TOOL := $(shell command -v docker >/dev/null 2>&1 && echo docker || command -v podman >/dev/null 2>&1 && echo podman || echo "")
+CONTAINER_TOOL := $(shell { command -v docker >/dev/null 2>&1 && echo docker; } || { command -v podman >/dev/null 2>&1 && echo podman; } || echo "")
 BUILDER := $(shell command -v buildah >/dev/null 2>&1 && echo buildah || echo $(CONTAINER_TOOL))
 
 # go source files
@@ -38,8 +38,6 @@ $(TOKENIZER_LIB):
 	curl -L https://github.com/daulet/tokenizers/releases/download/$(TOKENIZER_RELEASE)/libtokenizers.$(TARGETOS)-$(TARGETARCH).tar.gz | tar -xz -C lib
 	ranlib lib/*.a
 
-
-
 ##@ Precommit code checks --
 .PHONY: precommit lint tidy-go copr-fix
 precommit: tidy-go lint copr-fix