From a0fdf1d4e8b6743412833a2daa2c4d5d4b2df7cd Mon Sep 17 00:00:00 2001 From: ramadan8 <79653940+ramadan8@users.noreply.github.com> Date: Sun, 8 May 2022 03:17:05 +0200 Subject: [PATCH] Fix Dockerfile crash (#264) * Fix issue with Dockerfile.bot that stopped it from building. * Clean up code. --- Dockerfile.bot | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile.bot b/Dockerfile.bot index b74a239..7285db1 100644 --- a/Dockerfile.bot +++ b/Dockerfile.bot @@ -5,13 +5,14 @@ RUN apk --no-cache upgrade RUN apk add --no-cache git cmake msttcorefonts-installer python3 alpine-sdk ffmpeg wget rpm2cpio \ zlib-dev libpng-dev libjpeg-turbo-dev freetype-dev fontconfig-dev \ libtool libwebp-dev libxml2-dev pango-dev freetype fontconfig \ - vips vips-dev + vips vips-dev grep # gets latest version of twemoji RUN mkdir /tmp/twemoji \ && cd /tmp/twemoji \ -&& package=$(wget --quiet -O - https://fedora.mirror.liteserver.nl/linux/development/rawhide/Everything/aarch64/os/Packages/t/ | grep twitter-twemoji | grep -o 'href="[^"]*' | tail -c +7) \ -&& wget https://fedora.mirror.liteserver.nl/linux/development/rawhide/Everything/aarch64/os/Packages/t/$package && rpm2cpio $package | cpio -ivd \ +&& package=$(wget --quiet -O - https://fedora.mirror.liteserver.nl/linux/development/rawhide/Everything/aarch64/os/Packages/t/ | grep -Po '(?<=href=")twitter-twemoji-fonts-[^"]*' | tail -1) \ +&& wget https://fedora.mirror.liteserver.nl/linux/development/rawhide/Everything/aarch64/os/Packages/t/$package \ +&& rpm2cpio $package | cpio -ivd \ && cp ./usr/share/fonts/twemoji/Twemoji.ttf /usr/share/fonts/Twemoji.ttf \ && rm -r /tmp/twemoji