Skip to content

L
lxc
Commit aedfcb8a by Stéphane Graber Committed by GitHub
Options

Merge pull request #1811 from runejuhl/fix-alpine-apk-keys

Change alpine template file check to also check file size (`-f` => `-s`)
parents 6cc7d050 fc20af63
Showing with 2 additions and 2 deletions
templates/lxc-alpine.in
...@@ -185,7 +185,7 @@ fetch_apk_keys() { ...@@ -185,7 +185,7 @@ fetch_apk_keys() {
echo "$APK_KEYS_SHA256" | while read -r line; do echo "$APK_KEYS_SHA256" | while read -r line; do
keyname="${line##* }" keyname="${line##* }"
if [ ! -f "$keyname" ]; then if [ ! -s "$keyname" ]; then
fetch "$APK_KEYS_URI/$keyname" > "$keyname" fetch "$APK_KEYS_URI/$keyname" > "$keyname"
fi fi
echo "$line" | sha256sum -c - echo "$line" | sha256sum -c -
...@@ -210,7 +210,7 @@ fetch_apk_static() { ...@@ -210,7 +210,7 @@ fetch_apk_static() {
fetch "$MIRROR_URL/latest-stable/main/$arch/${pkg_name}-${pkg_ver}.apk" \ fetch "$MIRROR_URL/latest-stable/main/$arch/${pkg_name}-${pkg_ver}.apk" \
| tar -xz -C "$dest" sbin/ # --extract --gzip --directory | tar -xz -C "$dest" sbin/ # --extract --gzip --directory
[ -f "$dest/sbin/apk.static" ] || die 2 'apk.static not found' [ -s "$dest/sbin/apk.static" ] || die 2 'apk.static not found'
local keyname=$(echo "$dest"/sbin/apk.static.*.pub | sed 's/.*\.SIGN\.RSA\.//') local keyname=$(echo "$dest"/sbin/apk.static.*.pub | sed 's/.*\.SIGN\.RSA\.//')
openssl dgst -sha1 \ openssl dgst -sha1 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment