Skip to content

Commit

Permalink
Update sed pattern for docker image
Browse files Browse the repository at this point in the history
Since dani-garcia/vaultwarden#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.
  • Loading branch information
Glandos authored Jul 28, 2023
1 parent 0d8d685 commit 9ce7878
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 9ce7878

Please sign in to comment.