From 5cf256a0868beb7c89a90cbfb33d56ca51a89ee0 Mon Sep 17 00:00:00 2001
From: Masaya Suzuki <15100604+massongit@users.noreply.github.com>
Date: Fri, 31 Dec 2021 00:32:48 +0900
Subject: [PATCH] Fix download and uncompress libz (#2274)

---
 Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 429234d6..86f3bc73 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -329,15 +329,16 @@ RUN wget --tries=5 -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sger
     ca-certificates \
     git git-lfs \
     glibc-${GLIBC_VERSION}.apk \
+    tar zstd \
     gnupg \
     php7 php7-curl php7-ctype php7-dom php7-iconv php7-json php7-mbstring \
     php7-openssl php7-phar php7-simplexml php7-tokenizer php-xmlwriter \
     && rm glibc-${GLIBC_VERSION}.apk \
-    && wget -q --tries=5 -O /tmp/libz.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download \
+    && wget -q --tries=5 -O /tmp/libz.tar.zst https://www.archlinux.org/packages/core/x86_64/zlib/download \
     && mkdir /tmp/libz \
-    && tar -xf /tmp/libz.tar.xz -C /tmp/libz \
+    && tar -xf /tmp/libz.tar.zst -C /tmp/libz --zstd \
     && mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib \
-    && rm -rf /tmp/libz /tmp/libz.tar.xz \
+    && rm -rf /tmp/libz /tmp/libz.tar.zst \
     && wget -q --tries=5 -O phive.phar https://phar.io/releases/phive.phar \
     && wget -q --tries=5 -O phive.phar.asc https://phar.io/releases/phive.phar.asc \
     && PHAR_KEY_ID="0x9D8A98B29B2D5D79" \