topaLE
/
vaultwarden
mirror of https://github.com/dani-garcia/vaultwarden
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix: pin Debian MariaDB packages to 11.8.6

pull/7336/head
maxpetrusenkoagent 1 month ago
parent
dc82ad6d6c
commit
89dae0f082
2 changed files with 18 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      docker/Dockerfile.debian
  2. 17
      docker/Dockerfile.j2

17
docker/Dockerfile.debian
View File

@ -52,15 +52,16 @@ ENV DEBIAN_FRONTEND=noninteractive \
CARGO_HOME="/root/.cargo" \ CARGO_HOME="/root/.cargo" \
USER="root" USER="root"
# Force the install of an older MariaDB client library to prevent Diesel from # Pin MariaDB Connector/C to the latest known-working Trixie build before
# misreading result sets with affected MariaDB Connector/C releases. # 11.8.7 started breaking Diesel migration metadata/result handling.
# See https://github.com/dani-garcia/vaultwarden/issues/6416 # See https://github.com/dani-garcia/vaultwarden/issues/6416
# See https://github.com/dani-garcia/vaultwarden/issues/7268 # See https://github.com/dani-garcia/vaultwarden/issues/7268
RUN echo "deb http://snapshot.debian.org/archive/debian/20250707T084701Z/ trixie main" > /etc/apt/sources.list.d/mariadb-snapshot.list && \ RUN echo "deb http://snapshot.debian.org/archive/debian/20260617T000000Z/ trixie main" > /etc/apt/sources.list.d/mariadb-snapshot.list && \
echo "Acquire::Check-Valid-Until false;" > /etc/apt/apt.conf.d/allow-snapshot && \ echo "Acquire::Check-Valid-Until false;" > /etc/apt/apt.conf.d/allow-snapshot && \
echo 'Package: libmariadb* mariadb*' > /etc/apt/preferences.d/mariadb-snapshot && \ echo 'Package: libmariadb* mariadb-common' > /etc/apt/preferences.d/mariadb-snapshot && \
echo 'Pin: origin "snapshot.debian.org"' >> /etc/apt/preferences.d/mariadb-snapshot && \ echo 'Pin: origin "snapshot.debian.org"' >> /etc/apt/preferences.d/mariadb-snapshot && \
echo 'Pin-Priority: 1001' >> /etc/apt/preferences.d/mariadb-snapshot echo 'Pin-Priority: 1001' >> /etc/apt/preferences.d/mariadb-snapshot
# Install clang && xx-c-essentials to get `xx-cargo` working # Install clang && xx-c-essentials to get `xx-cargo` working
# Install pkg-config to allow amd64 builds to find all libraries # Install pkg-config to allow amd64 builds to find all libraries
# Install git so build.rs can determine the correct version # Install git so build.rs can determine the correct version
@ -158,13 +159,13 @@ ENV ROCKET_PROFILE="release" \
# Create data folder and Install needed libraries # Create data folder and Install needed libraries
RUN mkdir /data && \ RUN mkdir /data && \
# Force the install of an older MariaDB client library to prevent Diesel from # Pin MariaDB Connector/C to the latest known-working Trixie build before
# misreading result sets with affected MariaDB Connector/C releases. # 11.8.7 started breaking Diesel migration metadata/result handling.
# See https://github.com/dani-garcia/vaultwarden/issues/6416 # See https://github.com/dani-garcia/vaultwarden/issues/6416
# See https://github.com/dani-garcia/vaultwarden/issues/7268 # See https://github.com/dani-garcia/vaultwarden/issues/7268
echo "deb http://snapshot.debian.org/archive/debian/20250707T084701Z/ trixie main" > /etc/apt/sources.list.d/mariadb-snapshot.list && \ echo "deb http://snapshot.debian.org/archive/debian/20260617T000000Z/ trixie main" > /etc/apt/sources.list.d/mariadb-snapshot.list && \
echo "Acquire::Check-Valid-Until false;" > /etc/apt/apt.conf.d/allow-snapshot && \ echo "Acquire::Check-Valid-Until false;" > /etc/apt/apt.conf.d/allow-snapshot && \
echo 'Package: libmariadb* mariadb*' > /etc/apt/preferences.d/mariadb-snapshot && \ echo 'Package: libmariadb* mariadb-common' > /etc/apt/preferences.d/mariadb-snapshot && \
echo 'Pin: origin "snapshot.debian.org"' >> /etc/apt/preferences.d/mariadb-snapshot && \ echo 'Pin: origin "snapshot.debian.org"' >> /etc/apt/preferences.d/mariadb-snapshot && \
echo 'Pin-Priority: 1001' >> /etc/apt/preferences.d/mariadb-snapshot && \ echo 'Pin-Priority: 1001' >> /etc/apt/preferences.d/mariadb-snapshot && \
apt-get update && apt-get install -y \ apt-get update && apt-get install -y \

17
docker/Dockerfile.j2
View File

@ -72,15 +72,16 @@ ENV DEBIAN_FRONTEND=noninteractive \
# Debian Trixie uses libpq v17 # Debian Trixie uses libpq v17
PQ_LIB_DIR="/usr/local/musl/pq17/lib" PQ_LIB_DIR="/usr/local/musl/pq17/lib"
{%- endif %} {%- endif %}
{% if base == "debian" %} {% if base == "debian" %}
# Force the install of an older MariaDB client library to prevent Diesel from # Pin MariaDB Connector/C to the latest known-working Trixie build before
# misreading result sets with affected MariaDB Connector/C releases. # 11.8.7 started breaking Diesel migration metadata/result handling.
# See https://github.com/dani-garcia/vaultwarden/issues/6416 # See https://github.com/dani-garcia/vaultwarden/issues/6416
# See https://github.com/dani-garcia/vaultwarden/issues/7268 # See https://github.com/dani-garcia/vaultwarden/issues/7268
RUN echo "deb http://snapshot.debian.org/archive/debian/20250707T084701Z/ trixie main" > /etc/apt/sources.list.d/mariadb-snapshot.list && \ RUN echo "deb http://snapshot.debian.org/archive/debian/20260617T000000Z/ trixie main" > /etc/apt/sources.list.d/mariadb-snapshot.list && \
echo "Acquire::Check-Valid-Until false;" > /etc/apt/apt.conf.d/allow-snapshot && \ echo "Acquire::Check-Valid-Until false;" > /etc/apt/apt.conf.d/allow-snapshot && \
echo 'Package: libmariadb* mariadb*' > /etc/apt/preferences.d/mariadb-snapshot && \ echo 'Package: libmariadb* mariadb-common' > /etc/apt/preferences.d/mariadb-snapshot && \
echo 'Pin: origin "snapshot.debian.org"' >> /etc/apt/preferences.d/mariadb-snapshot && \ echo 'Pin: origin "snapshot.debian.org"' >> /etc/apt/preferences.d/mariadb-snapshot && \
echo 'Pin-Priority: 1001' >> /etc/apt/preferences.d/mariadb-snapshot echo 'Pin-Priority: 1001' >> /etc/apt/preferences.d/mariadb-snapshot
@ -203,13 +204,13 @@ ENV ROCKET_PROFILE="release" \
# Create data folder and Install needed libraries # Create data folder and Install needed libraries
RUN mkdir /data && \ RUN mkdir /data && \
{% if base == "debian" %} {% if base == "debian" %}
# Force the install of an older MariaDB client library to prevent Diesel from # Pin MariaDB Connector/C to the latest known-working Trixie build before
# misreading result sets with affected MariaDB Connector/C releases. # 11.8.7 started breaking Diesel migration metadata/result handling.
# See https://github.com/dani-garcia/vaultwarden/issues/6416 # See https://github.com/dani-garcia/vaultwarden/issues/6416
# See https://github.com/dani-garcia/vaultwarden/issues/7268 # See https://github.com/dani-garcia/vaultwarden/issues/7268
echo "deb http://snapshot.debian.org/archive/debian/20250707T084701Z/ trixie main" > /etc/apt/sources.list.d/mariadb-snapshot.list && \ echo "deb http://snapshot.debian.org/archive/debian/20260617T000000Z/ trixie main" > /etc/apt/sources.list.d/mariadb-snapshot.list && \
echo "Acquire::Check-Valid-Until false;" > /etc/apt/apt.conf.d/allow-snapshot && \ echo "Acquire::Check-Valid-Until false;" > /etc/apt/apt.conf.d/allow-snapshot && \
echo 'Package: libmariadb* mariadb*' > /etc/apt/preferences.d/mariadb-snapshot && \ echo 'Package: libmariadb* mariadb-common' > /etc/apt/preferences.d/mariadb-snapshot && \
echo 'Pin: origin "snapshot.debian.org"' >> /etc/apt/preferences.d/mariadb-snapshot && \ echo 'Pin: origin "snapshot.debian.org"' >> /etc/apt/preferences.d/mariadb-snapshot && \
echo 'Pin-Priority: 1001' >> /etc/apt/preferences.d/mariadb-snapshot && \ echo 'Pin-Priority: 1001' >> /etc/apt/preferences.d/mariadb-snapshot && \
apt-get update && apt-get install -y \ apt-get update && apt-get install -y \

Write Preview
Loading…
Cancel
Save