extern/KasmVNC
1
0
Fork 0
mirror of https://github.com/kasmtech/KasmVNC.git synced 2024-11-21 23:53:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Alpine and Oracle 9 build fixes

Browse Source
This commit is contained in:
mattmcclaskey 2023-03-13 15:57:24 -04:00
parent ec347f5b46
commit ba399efc3f
No known key found for this signature in database
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/dockerfile.alpine_317.build
View File

@ -68,6 +68,12 @@ RUN \
xorg-server-dev \ xorg-server-dev \
xtrans 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 RUN useradd -m docker && echo "docker:docker" | chpasswd
COPY --chown=docker:docker . /src/ COPY --chown=docker:docker . /src/

11
builder/dockerfile.oracle_9.build
View File

@ -49,12 +49,11 @@ RUN dnf install -y \
libXtst-devel \ libXtst-devel \
libXcursor-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 RUN useradd -m docker && echo "docker:docker" | chpasswd

3
builder/scripts/common.sh
View File

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