From d97308e3bdd89c18e403ccec0843b9b553fc5ec0 Mon Sep 17 00:00:00 2001 From: Nico Isenbeck Date: Sun, 12 Nov 2023 08:34:49 +0100 Subject: [PATCH] minor packaging fix --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 02fbfc8..a7422ae 100755 --- a/build.sh +++ b/build.sh @@ -123,7 +123,7 @@ CONTROL="$DEBIANDIR/control" cp "$DIR/control.dist" "$CONTROL" sed -i "s/@@PACKAGENAME@@/$PACKAGENAME/g" "$CONTROL" sed -i "s/@@VAULTWARDEN_DEPS@@/$VAULTWARDEN_DEPS/g" "$CONTROL" -sed -i "s/Version:.*/Version: $REF-1/" "$CONTROL" +sed -i "s/Version:.*/Version: $REF-1-$OS_VERSION_NAME/" "$CONTROL" sed -i "s/Architecture:.*/Architecture: $ARCH/" "$CONTROL" if [ -n "$RECOMMENDS" ]; then echo "Recommends: $RECOMMENDS" >> "$CONTROL" @@ -146,7 +146,7 @@ chmod 644 "$DEBIANDIR/sysusers.conf" sed tmpfiles.conf > "$DEBIANDIR/tmpfiles.conf" -f <( echo "$SEDCOMMANDS" ) || exit chmod 644 "$DEBIANDIR/tmpfiles.conf" -echo "[INFO] docker build -t vaultwarden-deb $DIR --build-arg DB=$DB_TYPE" +echo "[INFO] docker buildx -t vaultwarden-deb $DIR --build-arg DB=$DB_TYPE" docker buildx build -t vaultwarden-deb "$SRC" --build-arg DB="$DB_TYPE" --target dpkg -f "$DIR/Dockerfile" CID=$(docker run -d vaultwarden-deb)