Fix builder image

.gitignore

@@ -1,3 +1,4 @@
 build
 kaldi
-openfst*
+openfst*
+clapack-wasm

Makefile

@@ -1,6 +1,6 @@
 MAKEFILE_ROOT := $(realpath $(dir $(firstword $(MAKEFILE_LIST))))
 ENV := 
-BUILDER_TAG ?= 0.0.6
+BUILDER_TAG ?= 0.0.7
 REPOSITORY = ghcr.io/ccoreilly/
 
 ifdef DEBUG
@@ -9,10 +9,13 @@ endif
 
 .PHONY: builder
 builder:
-	docker build --progress=plain -f builder/Dockerfile -t ${REPOSITORY}vosk-wasm-builder:${BUILDER_TAG} builder
+	docker build --progress=plain -f builder/Dockerfile \
+	--cache-from ${REPOSITORY}vosk-wasm-builder:latest \
+	-t ${REPOSITORY}vosk-wasm-builder:${BUILDER_TAG} \
+	-t ${REPOSITORY}vosk-wasm-builder:latest builder
 
 push-builder: builder
-	docker push ${REPOSITORY}vosk-wasm-builder:${BUILDER_TAG}
+	docker push --all-tags ${REPOSITORY}vosk-wasm-builder
 
 .PHONY: binary
 binary:

builder/Dockerfile

@@ -12,7 +12,7 @@ RUN apt-get update \
 
 WORKDIR /opt/kaldi
 RUN git clone -b vosk --single-branch https://github.com/alphacep/kaldi . && \
-    git checkout 6417ac1dece94783e80dfbac0148604685d27579
+    git checkout 173438905ccd96195982ccdc0195dc03e66cb1da
 ADD kaldi.patch /tmp
 RUN git apply -v /tmp/kaldi.patch
 
@@ -22,7 +22,8 @@ RUN emmake make -j $(nproc) CXXFLAGS="-O3 -r" LDFLAGS=-O3 OPENFST_CONFIGURE="--e
 RUN find . -type f -path '*/.libs/*.a' -exec sh -xc 'mv {} $(dirname {})/..' \;
 
 WORKDIR /opt/kaldi/tools/clapack-wasm
-RUN git clone https://gitlab.inria.fr/kaldi.web/clapack-wasm.git .
+RUN git clone -b master --single-branch https://github.com/ccoreilly/clapack-wasm . && \
+    git checkout a24a1c96415b1f39053be724012512d02bef904d
 ADD clapack-wasm.patch /tmp
 RUN git apply -v /tmp/clapack-wasm.patch
 RUN make 

builder/kaldi.patch

@@ -6,9 +6,10 @@ index 69aebdb26..bd66c91eb 100644
 
  # Reset the default goal, so that the all target will become default
  .DEFAULT_GOAL :=
+ .PHONY: all mklibdir rmlibdir checkversion
 -all: $(SUBDIRS) matrix/test
 +all: $(SUBDIRS) #matrix/test
- 	-echo Done
+ 	@echo Done
 
  mklibdir:
 diff --git a/src/configure b/src/configure
@@ -227,9 +228,9 @@ index 000000000..3d016dc28
 +--- a/configure.ac
 ++++ b/configure.ac
 +@@ -149,40 +149,6 @@ AC_ARG_WITH([libfstdir],
-+ 
++
 + AC_SUBST([libfstdir], $with_libfstdir)
-+ 
++
 +-# Flags may be changed after configuring, so this is checked again by
 +-# weight_test.cc.  The check here is to save time in the common case,
 +-# or when someone does not run `make check`.
@@ -266,4 +267,4 @@ index 000000000..3d016dc28
 +-
 + AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
 + AC_SUBST([DL_LIBS])
-+ 
++