Merge pull request #583 from nextcloud/bugfix/upgrade-sqlite

Upgrade sqlite version to 3.43.
nextcloud · Aug 30, 2023 · e674fca · e674fca
2 parents 2699262 + 350219b
commit e674fca
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/client-appimage/Dockerfile b/client-appimage/Dockerfile
@@ -10,6 +10,8 @@ ENV VER_QT_DATE 2023-08-22
 ENV VER_OPENSSL 3.0.10
 ENV VER_LIBP11 libp11-0.4.12
 ENV VER_KFRAMEWORKS 5.107.0
+ENV VER_SQLITE 3430000
+ENV VER_SQLITE_YEAR 2023
 
 ENV QT_ROOT /opt/qt${VER_QT}
 
@@ -27,7 +29,6 @@ RUN sed -i '/deb-src/s/^# //' /etc/apt/sources.list && \
  # Install packages
  apt-get update && \
  DEBIAN_FRONTEND=noninteractive apt-get install -q -y \
- libsqlite3-dev \
  git \
  ninja-build \
  curl \
@@ -137,6 +138,16 @@ RUN cd /tmp && \
  cd .. && \
  rm -rf ${VER_LIBP11}
 
+# Install sqlite3 from https://www.sqlite.org/amalgamation.html
+# https://www3.sqlite.org/src/dir?ci=tip&name=autoconf
+RUN cd /tmp && \
+ wget https://www.sqlite.org/${VER_SQLITE_YEAR}/sqlite-autoconf-${VER_SQLITE}.tar.gz && \
+ tar xvf sqlite-autoconf-${VER_SQLITE}.tar.gz && \
+ cd sqlite-autoconf-${VER_SQLITE} && \
+ ./configure && make && make install && \
+ cd .. && \
+ rm -rf sqlite-autoconf-${VER_SQLITE}
+
 ###########################################################################
 
 # Download Qt sources
@@ -190,7 +201,7 @@ RUN if [ "$BUILD_QT" != "1" ] ; then \
  ; fi
 
 RUN if [ "$BUILD_QT" != "1" ] ; then \
- DEBIAN_FRONTEND=noninteractive apt-get remove -q -y --purge qtbase5-dev \
+ DEBIAN_FRONTEND=noninteractive apt-get remove -q -y --purge qtbase5-dev libsqlite3-dev \
  ; fi
 
 ###########################################################################

diff --git a/client/Dockerfile b/client/Dockerfile
@@ -10,6 +10,8 @@ ENV VER_QT_DATE 2023-08-21
 ENV VER_OPENSSL 3.0.10
 ENV VER_LIBP11 libp11-0.4.12
 ENV VER_KFRAMEWORKS 5.107.0
+ENV VER_SQLITE 3430000
+ENV VER_SQLITE_YEAR 2023
 
 ENV QT_ROOT /opt/qt${VER_QT}
 
@@ -18,7 +20,6 @@ RUN sed -i '/deb-src/s/^# //' /etc/apt/sources.list && \
  apt-get install -y apt-transport-https ca-certificates gnupg software-properties-common wget && \
  apt-get update && \
  DEBIAN_FRONTEND=noninteractive apt-get install -q -y \
- libsqlite3-dev \
  git \
  ninja-build \
  curl \
@@ -133,6 +134,16 @@ RUN cd /tmp && \
  cd .. && \
  rm -rf ${VER_LIBP11}
 
+# Install sqlite3 from https://www.sqlite.org/amalgamation.html
+# https://www3.sqlite.org/src/dir?ci=tip&name=autoconf
+RUN cd /tmp && \
+ wget https://www.sqlite.org/${VER_SQLITE_YEAR}/sqlite-autoconf-${VER_SQLITE}.tar.gz && \
+ tar xvf sqlite-autoconf-${VER_SQLITE}.tar.gz && \
+ cd sqlite-autoconf-${VER_SQLITE} && \
+ ./configure && make && make install && \
+ cd .. && \
+ rm -rf sqlite-autoconf-${VER_SQLITE}
+
 ###########################################################################
 
 # Download Qt sources
@@ -193,7 +204,7 @@ RUN if [ "$BUILD_QT" != "1" ] ; then \
  ; fi
 
 RUN if [ "$BUILD_QT" != "1" ] ; then \
- DEBIAN_FRONTEND=noninteractive apt-get remove -q -y --purge qtbase5-dev \
+ DEBIAN_FRONTEND=noninteractive apt-get remove -q -y --purge qtbase5-dev libsqlite3-dev \
  ; fi
 
 ###########################################################################