Skip to content

Commit fe0fe8a

Browse files
committed
Add "devel" commit description to Dockerfile
1 parent 11b071d commit fe0fe8a

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

devel/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ FROM alpine:3.10
22

33
# https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel
44
ENV _BASH_COMMIT ea578790a910fcd394930de7a1933a9ee24f9119
5+
ENV _BASH_COMMIT_DESC commit bash-20190705 snapshot
56
# prefixed with "_" since "$BASH..." have meaning in Bash parlance
67

78
RUN set -eux; \

update.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@ for version in "${versions[@]}"; do
3030
echo >&2 "error: cannot determine commit for $version (from https://git.savannah.gnu.org/cgit/bash.git)"
3131
exit 1
3232
fi
33-
echo "$version: $commit"
34-
sed -ri -e 's/^(ENV _BASH_COMMIT) .*/\1 '"$commit"'/' "$version/Dockerfile"
33+
desc="$(curl -fsSL "https://git.savannah.gnu.org/cgit/bash.git/patch/?id=$commit" | sed -n '/^Subject: /{s///p;q}')"
34+
echo "$version: $commit ($desc)"
35+
sed -ri -e 's/^(ENV _BASH_COMMIT) .*/\1 '"$commit"'/' \
36+
-e 's!^(ENV _BASH_COMMIT_DESC) .*!\1 '"$desc"'!' \
37+
"$version/Dockerfile"
3538
cp -a docker-entrypoint.sh "$version/"
3639
travisEnv='\n - VERSION='"$version$travisEnv"
3740
continue

0 commit comments

Comments
 (0)