From 9ce78789077fa33f90b53a6145423435d3c812c7 Mon Sep 17 00:00:00 2001 From: Glandos Date: Sat, 29 Jul 2023 00:16:38 +0200 Subject: [PATCH] Update sed pattern for docker image Since https://github.com/dani-garcia/vaultwarden/pull/3505 the FQDN is used, so we must change the sed pattern accordingly. As a bonus, let's keep the rust version that was previously dropped. --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 8840432..64ffcda 100755 --- a/build.sh +++ b/build.sh @@ -87,8 +87,8 @@ sed "$DIR/patch/$ARCH_DIR/Dockerfile.patch" -f <( echo "$SEDCOMMANDS" ) | \ patch "$SRC/docker/$ARCH_DIR/Dockerfile" --verbose -o "$DIR/Dockerfile" || \ exit -sed -E "s/(FROM[[:space:]]*rust:)[^[:space:]]+(.+)/\1${OS_VERSION_NAME}\2/g" -i "$DIR/Dockerfile" -sed -E "s/(FROM[[:space:]]*debian:)[^-]+(-.+)/\1${OS_VERSION_NAME}\2/g" -i "$DIR/Dockerfile" +sed -E "s/(FROM[[:space:]]*docker.io\/library\/rust:[^-]+)[^[:space:]]+(.+)/\1-${OS_VERSION_NAME}\2/g" -i "$DIR/Dockerfile" +sed -E "s/(FROM[[:space:]]*docker.io\/library\/debian:)[^-]+(-.+)/\1${OS_VERSION_NAME}\2/g" -i "$DIR/Dockerfile" # Prepare Controlfile CONTROL="$DEBIANDIR/control"