Skip to content

Commit 8b92e1b

Browse files
committed
Adapt to new dnf override for Fedora
1 parent 4bd1058 commit 8b92e1b

1 file changed

Lines changed: 23 additions & 9 deletions

File tree

‎build-fedora.sh‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,31 @@ platforms="${PLATFORMS:-linux/amd64,linux/arm64}"
44
docker-tags fedora |
55
while read tag; do
66
dockerfile=$(mktemp)
7-
sedcommand="sed -e 's|^metalink=|#metalink=|g' \
8-
-e 's|^#baseurl=http://download.example/pub/fedora/linux|baseurl=https://mirrors.ustc.edu.cn/fedora|g' \
9-
-i.bak "
10-
cat << EOF > $dockerfile
11-
FROM fedora:$tag
12-
RUN $sedcommand /etc/yum.repos.d/fedora-modular.repo /etc/yum.repos.d/fedora-updates-modular.repo || true \
13-
&& $sedcommand /etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora-updates.repo
7+
printf 'FROM fedora:%s\n' "$tag" > "$dockerfile"
8+
cat << 'EOF' >> "$dockerfile"
9+
RUN mkdir -p /etc/dnf/repos.override.d \
10+
&& printf '%s\n' \
11+
'[fedora]' \
12+
'baseurl=https://mirrors.ustc.edu.cn/fedora/releases/$releasever/Everything/$basearch/os/' \
13+
'metalink=' \
14+
'[updates]' \
15+
'baseurl=https://mirrors.ustc.edu.cn/fedora/updates/$releasever/Everything/$basearch/' \
16+
'metalink=' \
17+
> /etc/dnf/repos.override.d/99-ustc.repo \
18+
&& for file in /etc/yum.repos.d/fedora-modular.repo \
19+
/etc/yum.repos.d/fedora-updates-modular.repo \
20+
/etc/yum.repos.d/fedora.repo \
21+
/etc/yum.repos.d/fedora-updates.repo; do \
22+
if [ -f "$file" ]; then \
23+
sed -e 's|^metalink=|#metalink=|g' \
24+
-e 's|^#baseurl=http://download.example/pub/fedora/linux|baseurl=https://mirrors.ustc.edu.cn/fedora|g' \
25+
-i.bak "$file" || exit 1; \
26+
fi; \
27+
done
1428
EOF
15-
docker buildx build --platform "$platforms" -f $dockerfile \
29+
docker buildx build --platform "$platforms" -f "$dockerfile" \
1630
-t ustclug/fedora:$tag \
1731
-t ghcr.io/ustclug/fedora:$tag \
1832
--push .
19-
rm $dockerfile
33+
rm "$dockerfile"
2034
done

0 commit comments

Comments
 (0)