Skip to content

Commit e9e17f4

Browse files
authored
Immich: pin compiled photo library revisions (#7395)
- Immich base has already switched to Trixie; until we get a Trixie LXC any further updates to the base image might conflict with our Bookworm LXC
1 parent 2c1b15a commit e9e17f4

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

ct/immich.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,8 @@ function compile_libjxl() {
206206
SOURCE=${SOURCE_DIR}/libjxl
207207
JPEGLI_LIBJPEG_LIBRARY_SOVERSION="62"
208208
JPEGLI_LIBJPEG_LIBRARY_VERSION="62.3.0"
209-
: "${LIBJXL_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libjxl.json)}"
209+
# : "${LIBJXL_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libjxl.json)}"
210+
: "${LIBJXL_REVISION:=794a5dcf0d54f9f0b20d288a12e87afb91d20dfc"
210211
if [[ "${update:-}" ]] || [[ "$LIBJXL_REVISION" != "$(grep 'libjxl' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
211212
msg_info "Recompiling libjxl"
212213
if [[ -d "$SOURCE" ]]; then rm -rf "$SOURCE"; fi
@@ -253,7 +254,8 @@ function compile_libheif() {
253254
$STD apt-get install -y libaom-dev
254255
local update="required"
255256
fi
256-
: "${LIBHEIF_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libheif.json)}"
257+
# : "${LIBHEIF_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libheif.json)}"
258+
: "${LIBHEIF_REVISION:=35dad50a9145332a7bfdf1ff6aef6801fb613d68"
257259
if [[ "${update:-}" ]] || [[ "$LIBHEIF_REVISION" != "$(grep 'libheif' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
258260
msg_info "Recompiling libheif"
259261
if [[ -d "$SOURCE" ]]; then rm -rf "$SOURCE"; fi
@@ -285,7 +287,8 @@ function compile_libheif() {
285287
function compile_libraw() {
286288
SOURCE=${SOURCE_DIR}/libraw
287289
local update
288-
: "${LIBRAW_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libraw.json)}"
290+
# : "${LIBRAW_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libraw.json)}"
291+
: "${LIBRAW_REVISION:=09bea31181b43e97959ee5452d91e5bc66365f1f"
289292
if [[ "${update:-}" ]] || [[ "$LIBRAW_REVISION" != "$(grep 'libraw' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
290293
msg_info "Recompiling libraw"
291294
if [[ -d "$SOURCE" ]]; then rm -rf "$SOURCE"; fi
@@ -306,7 +309,8 @@ function compile_libraw() {
306309
307310
function compile_imagemagick() {
308311
SOURCE=$SOURCE_DIR/imagemagick
309-
: "${IMAGEMAGICK_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/imagemagick.json)}"
312+
# : "${IMAGEMAGICK_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/imagemagick.json)}"
313+
: "${IMAGEMAGICK_REVISION:=8289a3388a085ad5ae81aa6812f21554bdfd54f2"
310314
if [[ "${update:-}" ]] || [[ "$IMAGEMAGICK_REVISION" != "$(grep 'imagemagick' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
311315
msg_info "Recompiling ImageMagick"
312316
if [[ -d "$SOURCE" ]]; then rm -rf "$SOURCE"; fi
@@ -326,7 +330,8 @@ function compile_imagemagick() {
326330
327331
function compile_libvips() {
328332
SOURCE=$SOURCE_DIR/libvips
329-
: "${LIBVIPS_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libvips.json)}"
333+
# : "${LIBVIPS_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libvips.json)}"
334+
: "${LIBVIPS_REVISION:=8fa37a64547e392d3808eed8d72adab7e02b3d00"
330335
if [[ "${update:-}" ]] || [[ "$LIBVIPS_REVISION" != "$(grep 'libvips' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
331336
msg_info "Recompiling libvips"
332337
if [[ -d "$SOURCE" ]]; then rm -rf "$SOURCE"; fi

install/immich-install.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ cd "$STAGING_DIR"
169169
SOURCE=${SOURCE_DIR}/libjxl
170170
JPEGLI_LIBJPEG_LIBRARY_SOVERSION="62"
171171
JPEGLI_LIBJPEG_LIBRARY_VERSION="62.3.0"
172-
: "${LIBJXL_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libjxl.json)}"
172+
# : "${LIBJXL_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libjxl.json)}"
173+
: "${LIBJXL_REVISION:=794a5dcf0d54f9f0b20d288a12e87afb91d20dfc"
173174
$STD git clone https://github.com/libjxl/libjxl.git "$SOURCE"
174175
cd "$SOURCE"
175176
$STD git reset --hard "$LIBJXL_REVISION"
@@ -204,7 +205,8 @@ cd "$STAGING_DIR"
204205
rm -rf "$SOURCE"/{build,third_party}
205206
206207
SOURCE=${SOURCE_DIR}/libheif
207-
: "${LIBHEIF_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libheif.json)}"
208+
# : "${LIBHEIF_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libheif.json)}"
209+
: "${LIBHEIF_REVISION:=35dad50a9145332a7bfdf1ff6aef6801fb613d68"
208210
$STD git clone https://github.com/strukturag/libheif.git "$SOURCE"
209211
cd "$SOURCE"
210212
$STD git reset --hard "$LIBHEIF_REVISION"
@@ -227,7 +229,8 @@ cd "$STAGING_DIR"
227229
rm -rf "$SOURCE"/build
228230
229231
SOURCE=${SOURCE_DIR}/libraw
230-
: "${LIBRAW_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libraw.json)}"
232+
# : "${LIBRAW_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libraw.json)}"
233+
: "${LIBRAW_REVISION:=09bea31181b43e97959ee5452d91e5bc66365f1f"
231234
$STD git clone https://github.com/libraw/libraw.git "$SOURCE"
232235
cd "$SOURCE"
233236
$STD git reset --hard "$LIBRAW_REVISION"
@@ -240,7 +243,8 @@ $STD make clean
240243
cd "$STAGING_DIR"
241244
242245
SOURCE=$SOURCE_DIR/imagemagick
243-
: "${IMAGEMAGICK_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/imagemagick.json)}"
246+
# : "${IMAGEMAGICK_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/imagemagick.json)}"
247+
: "${IMAGEMAGICK_REVISION:=8289a3388a085ad5ae81aa6812f21554bdfd54f2"
244248
$STD git clone https://github.com/ImageMagick/ImageMagick.git "$SOURCE"
245249
cd "$SOURCE"
246250
$STD git reset --hard "$IMAGEMAGICK_REVISION"
@@ -252,7 +256,8 @@ $STD make clean
252256
cd "$STAGING_DIR"
253257
254258
SOURCE=$SOURCE_DIR/libvips
255-
: "${LIBVIPS_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libvips.json)}"
259+
# : "${LIBVIPS_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libvips.json)}"
260+
: "${LIBVIPS_REVISION:=8fa37a64547e392d3808eed8d72adab7e02b3d00"
256261
$STD git clone https://github.com/libvips/libvips.git "$SOURCE"
257262
cd "$SOURCE"
258263
$STD git reset --hard "$LIBVIPS_REVISION"

0 commit comments

Comments
 (0)