Skip to content

Commit 0cf59ca

Browse files
committed
Improve docker build
1 parent 0697393 commit 0cf59ca

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

‎tests/docker.sh

+5-8
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,12 @@ join_images() {
5656
for f in alpine; do
5757
for arch in $arches; do
5858
cp tests/dockerfiles/Dockerfile.$f Dockerfile.$arch
59-
if [ "$arch" == "riscv64" ]; then
60-
sed "s|FROM .*|FROM danog/php:8.2-fpm-$f|" -i Dockerfile.$arch
61-
else
62-
sed "s|FROM .*||" -i Dockerfile.$arch
63-
cat Dockerfile Dockerfile.$arch > Dockerfile.final
64-
mv Dockerfile.final Dockerfile.$arch
65-
fi
59+
60+
sed "s|FROM .*||" -i Dockerfile.$arch
61+
cat Dockerfile Dockerfile.$arch > Dockerfile.final
62+
6663
docker buildx build --platform linux/$arch . \
67-
-f Dockerfile.$arch \
64+
-f Dockerfile.final \
6865
-t danog/madelineproto:next-$f-$arch \
6966
--cache-from danog/madelineproto:next-$f-$arch \
7067
--cache-to type=inline \

0 commit comments

Comments
 (0)