Alpine and Oracle 9 build fixes

builder/dockerfile.alpine_317.build

@@ -68,6 +68,12 @@ RUN \
     xorg-server-dev \
     xtrans
 
+
+ENV SCRIPTS_DIR=/tmp/scripts
+COPY builder/scripts $SCRIPTS_DIR
+RUN $SCRIPTS_DIR/build-webp
+RUN $SCRIPTS_DIR/build-libjpeg-turbo
+
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 
 COPY --chown=docker:docker . /src/

builder/dockerfile.oracle_9.build

@@ -49,12 +49,11 @@ RUN dnf install -y \
   libXtst-devel \
   libXcursor-devel
 
-# Additions for webp
+
-RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+ENV SCRIPTS_DIR=/tmp/scripts
-RUN cd /tmp && tar -xzf /tmp/libwebp-*
+COPY builder/scripts $SCRIPTS_DIR
-RUN cd /tmp/libwebp-1.0.2 && \
+RUN $SCRIPTS_DIR/build-webp
-    ./configure --enable-static --disable-shared && \
+RUN $SCRIPTS_DIR/build-libjpeg-turbo
-    make && make install
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 

builder/scripts/common.sh

@@ -9,6 +9,8 @@ detect_distro() {
     DISTRO=fedora
   elif [ -f /usr/bin/zypper ]; then
     DISTRO=opensuse
+  elif [ -f /etc/alpine-release ]; then
+    DISTRO=alpine
   else
     DISTRO=debian
   fi
@@ -22,6 +24,7 @@ install_packages() {
     oracle) install_cmd="dnf install -y" ;;
     fedora) install_cmd="dnf install -y" ;;
     opensuse) install_cmd="zypper install -y" ;;
+    alpine) install_cmd="apk add" ;;
     *) install_cmd="apt-get update && apt-get install -y"
   esac