[chore] Add ragel to Docker images (#46)

See discussion in <koreader/koreader-base#1025 (comment)>. Also includes TC update to <koreader/koxtoolchain@5763389>.
koreader · Jan 5, 2020 · 7b1413e · 7b1413e
1 parent 2d19c78
commit 7b1413e
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 22 deletions.
diff --git a/docker/ubuntu/baseimage-clang/Dockerfile b/docker/ubuntu/baseimage-clang/Dockerfile
@@ -1,4 +1,4 @@
-FROM koreader/kobase:0.1.4
+FROM koreader/kobase:0.1.5
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

diff --git a/docker/ubuntu/baseimage-clang/Makefile b/docker/ubuntu/baseimage-clang/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.1.3
+VERSION=0.1.4
 
 all: build
 

diff --git a/docker/ubuntu/baseimage-python/Dockerfile b/docker/ubuntu/baseimage-python/Dockerfile
@@ -1,4 +1,4 @@
-FROM koreader/kobase:0.1.4
+FROM koreader/kobase:0.1.5
 
 USER root
 RUN apt-get update \

diff --git a/docker/ubuntu/baseimage-python/Makefile b/docker/ubuntu/baseimage-python/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.1.4
+VERSION=0.1.5
 
 all: build
 

diff --git a/docker/ubuntu/baseimage/Makefile b/docker/ubuntu/baseimage/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.1.4
+VERSION=0.1.5
 
 all: build
 

diff --git a/docker/ubuntu/baseimage/bootstrap.sh b/docker/ubuntu/baseimage/bootstrap.sh
@@ -17,6 +17,7 @@ MISC_TOOLS=(git subversion zip unzip vim wget p7zip-full bash-completion
     sudo libtool libtool-bin)
 LUAJIT_DEPS=("${LIB32_GCC_DEV[@]}" libc6-dev-amd64:i386)
 GLIB_DEPS="gettext"
+HARFBUZZ_DEPS="ragel"
 
 echo " ------------------------------------------"
 echo "| installing dependencies..."
@@ -31,6 +32,7 @@ apt-get install -y \
     patch libtool nasm autoconf2.64 \
     "${TC_BUILD_DEPS[@]}" \
     $GLIB_DEPS \
+    $HARFBUZZ_DEPS \
     "${ARM_SF_TC[@]}" "${ARM_HF_TC[@]}" \
     "${LUAJIT_DEPS[@]}"
 

diff --git a/docker/ubuntu/koandroid/Dockerfile b/docker/ubuntu/koandroid/Dockerfile
@@ -1,4 +1,4 @@
-FROM frenzie/kobase-python:0.1.2
+FROM koreader/kobase-python:0.1.5
 
 USER root
 RUN apt-get update && \

diff --git a/docker/ubuntu/koandroid/Makefile b/docker/ubuntu/koandroid/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.3
+VERSION=0.3.1
 
 all: build
 

diff --git a/docker/ubuntu/koappimage/Dockerfile b/docker/ubuntu/koappimage/Dockerfile
@@ -1,4 +1,4 @@
-FROM koreader/kobase-python:0.1.4
+FROM koreader/kobase-python:0.1.5
 
 USER root
 RUN apt-get update && \

diff --git a/docker/ubuntu/koappimage/Makefile b/docker/ubuntu/koappimage/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.1.6
+VERSION=0.1.7
 
 all: build
 

diff --git a/docker/ubuntu/kocervantes/Dockerfile b/docker/ubuntu/kocervantes/Dockerfile
@@ -1,4 +1,4 @@
-FROM frenzie/kobase:0.1.2
+FROM koreader/kobase:0.1.5
 
 USER ko
 

diff --git a/docker/ubuntu/kocervantes/Makefile b/docker/ubuntu/kocervantes/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.1.1
+VERSION=0.1.2
 
 all: build
 

diff --git a/docker/ubuntu/kocervantes/build_cervantes_tc.sh b/docker/ubuntu/kocervantes/build_cervantes_tc.sh
@@ -3,7 +3,7 @@
 echo "Building toolchains for cervantes..."
 git clone https://github.com/koreader/koxtoolchain.git
 pushd koxtoolchain && {
-    git checkout 1f65f8df7844da7675f76b48793e301db87cc18c
+    git checkout 576338981f3ba6723801c3056ae2c7ca33915181
 
     ./gen-tc.sh cervantes
 } && popd || exit

diff --git a/docker/ubuntu/kokindle/Dockerfile b/docker/ubuntu/kokindle/Dockerfile
@@ -1,4 +1,4 @@
-FROM frenzie/kobase:0.1.2
+FROM koreader/kobase:0.1.5
 
 USER ko
 

diff --git a/docker/ubuntu/kokindle/Makefile b/docker/ubuntu/kokindle/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.1.1
+VERSION=0.1.2
 
 all: build
 

diff --git a/docker/ubuntu/kokindle/build_kindle_tc.sh b/docker/ubuntu/kokindle/build_kindle_tc.sh
@@ -3,7 +3,7 @@
 echo "Building toolchains for kindle..."
 git clone https://github.com/koreader/koxtoolchain.git
 pushd koxtoolchain && {
-    git checkout 1f65f8df7844da7675f76b48793e301db87cc18c
+    git checkout 576338981f3ba6723801c3056ae2c7ca33915181
 
     ./gen-tc.sh kindle || ./gen-tc.sh kindle
     ./gen-tc.sh kindle5 || ./gen-tc.sh kindle5

diff --git a/docker/ubuntu/kokobo/Dockerfile b/docker/ubuntu/kokobo/Dockerfile
@@ -1,4 +1,4 @@
-FROM frenzie/kobase:0.1.2
+FROM koreader/kobase:0.1.5
 
 USER ko
 

diff --git a/docker/ubuntu/kokobo/Makefile b/docker/ubuntu/kokobo/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.1.1
+VERSION=0.1.2
 
 all: build
 

diff --git a/docker/ubuntu/kokobo/build_kobo_tc.sh b/docker/ubuntu/kokobo/build_kobo_tc.sh
@@ -3,7 +3,7 @@
 echo "Building toolchains for kobo..."
 git clone https://github.com/koreader/koxtoolchain.git
 pushd koxtoolchain && {
-    git checkout 1f65f8df7844da7675f76b48793e301db87cc18c
+    git checkout 576338981f3ba6723801c3056ae2c7ca33915181
 
     ./gen-tc.sh kobo
 } && popd || exit

diff --git a/docker/ubuntu/kopb/Dockerfile b/docker/ubuntu/kopb/Dockerfile
@@ -1,4 +1,4 @@
-FROM frenzie/kobase-python:0.1.2
+FROM koreader/kobase-python:0.1.5
 
 ENV DEBIAN_FRONTEND noninteractive
 

diff --git a/docker/ubuntu/kopb/Makefile b/docker/ubuntu/kopb/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.1.2
+VERSION=0.1.3
 
 all: build
 

diff --git a/docker/ubuntu/kout/Dockerfile b/docker/ubuntu/kout/Dockerfile
@@ -1,4 +1,4 @@
-FROM frenzie/kobase:0.1.2
+FROM koreader/kobase:0.1.5
 
 USER root
 RUN apt-get update \

diff --git a/docker/ubuntu/kout/Makefile b/docker/ubuntu/kout/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.0.1
+VERSION=0.0.2
 
 all: build