riscv temporary fix #43 & 9.0.10

ChatDeBlofeld · Feb 25, 2023 · 7348aa7 · 7348aa7
1 parent c7c3557
commit 7348aa7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/.env.example b/.env.example
@@ -1,12 +1,10 @@
-REVISION=9
+REVISION=11
 
 BUILDER_IMAGE=franchetti/seafile-arm:builder
 DOCKERFILE_DIR="."
 MULTIARCH_PLATFORMS="linux/amd64,linux/riscv64,linux/arm/v7,linux/arm64"
 
-SEAFILE_SERVER_VERSION="9.0.9"
-PYTHON_REQUIREMENTS_URL_SEAHUB="https://raw.githubusercontent.com/ChatDeBlofeld/seafile-arm-docker-base/v${SEAFILE_SERVER_VERSION}/requirements/seahub.txt"
-PYTHON_REQUIREMENTS_URL_SEAFDAV="https://raw.githubusercontent.com/ChatDeBlofeld/seafile-arm-docker-base/v${SEAFILE_SERVER_VERSION}/requirements/seafdav.txt"
+SEAFILE_SERVER_VERSION="9.0.10"
 
 REGISTRY=""
 REPOSITORY="franchetti"

diff --git a/Dockerfile b/Dockerfile
@@ -38,13 +38,14 @@ COPY custom/db_update_helper.py seafile-server-$SEAFILE_SERVER_VERSION/upgrade/d
 
 RUN chmod -R g+w .
 
-FROM --platform=$TARGETPLATFORM ubuntu:jammy
+# FIXME: pinned ubuntu version due to riscv issue
+FROM --platform=$TARGETPLATFORM ubuntu:jammy-20221130
 
 ARG TARGETPLATFORM
 
 COPY requirements /requirements
 
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+RUN apt-get update && apt-get upgrade -y && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
     sudo \
     tzdata \
     procps \

diff --git a/Dockerfile.builder b/Dockerfile.builder
@@ -1,4 +1,4 @@
-FROM --platform=$TARGETPLATFORM ubuntu:jammy
+FROM --platform=$TARGETPLATFORM ubuntu:jammy-20221130
 
 ARG TARGETPLATFORM
 
@@ -19,5 +19,4 @@ RUN ./build.sh -D
 
 # Installing python dependencies, mixing native and pip packages
 COPY requirements /requirements
-
 RUN /requirements/install.sh -pnl $TARGETPLATFORM
diff --git a/build_image.sh b/build_image.sh
@@ -10,7 +10,7 @@ then
     set +a
 fi
 
-while getopts R:D:r:u:i:t:v:h:d:l:P:f:B:pq flag
+while getopts R:D:r:u:i:t:v:l:P:f:B:pq flag
 do
     case "${flag}" in
         R) REVISION=$OPTARG;;
@@ -24,7 +24,7 @@ do
         p) OUTPUT="--push";;
         P) MULTIARCH_PLATFORMS=$OPTARG;;
         l) OUTPUT="--load"; MULTIARCH_PLATFORMS="linux/$OPTARG";;
-        v) SEAFILE_SERVER_VERSION=$OPTARG
+        v) SEAFILE_SERVER_VERSION=$OPTARG;;
         q) QUIET="-q";;
         :) exit 1;;
         \?) exit 1;; 

diff --git a/requirements/install.sh b/requirements/install.sh
@@ -15,7 +15,6 @@ do
 done
 
 REQUIREMENTS_DIR="/requirements"
-# REQUIREMENTS_DIR="/home/thibaud/Bureau/git/seafile-arm-docker-base/requirements"
 
 if [ $NATIVE ]; then
     grep -vE '^#' "$REQUIREMENTS_DIR/native/native.$TAG.txt" | xargs apt-get install -y