From ba399efc3fac327e7fed9942ca79f3ef5025d7fd Mon Sep 17 00:00:00 2001
From: mattmcclaskey <matt@kasmweb.com>
Date: Mon, 13 Mar 2023 15:57:24 -0400
Subject: [PATCH] Alpine and Oracle 9 build fixes

---
 builder/dockerfile.alpine_317.build |  6 ++++++
 builder/dockerfile.oracle_9.build   | 11 +++++------
 builder/scripts/common.sh           |  3 +++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/builder/dockerfile.alpine_317.build b/builder/dockerfile.alpine_317.build
index 6e44049..2fdecd3 100644
--- a/builder/dockerfile.alpine_317.build
+++ b/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/
diff --git a/builder/dockerfile.oracle_9.build b/builder/dockerfile.oracle_9.build
index 9c3c544..2b4a102 100644
--- a/builder/dockerfile.oracle_9.build
+++ b/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
-RUN cd /tmp && tar -xzf /tmp/libwebp-*
-RUN cd /tmp/libwebp-1.0.2 && \
-    ./configure --enable-static --disable-shared && \
-    make && make install
+
+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
 
diff --git a/builder/scripts/common.sh b/builder/scripts/common.sh
index 4ed44b5..4440b66 100644
--- a/builder/scripts/common.sh
+++ b/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