From d67e5288e3fef87aa907f64343308f600cd738bb Mon Sep 17 00:00:00 2001 From: "ryan.kuba" Date: Tue, 28 May 2024 10:22:18 -0400 Subject: [PATCH] KASM-6027 build KasmVNC for Alpine 3.20 --- .gitlab-ci.yml | 38 ++++++++++++ builder/dockerfile.alpine_320.apk.build | 7 +++ builder/dockerfile.alpine_320.build | 82 +++++++++++++++++++++++++ 3 files changed, 127 insertions(+) create mode 100644 builder/dockerfile.alpine_320.apk.build create mode 100644 builder/dockerfile.alpine_320.build diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb73e0c..fd02ff3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -780,6 +780,44 @@ build_alpine_319_arm: paths: - output/ +build_alpine_320: + stage: build + allow_failure: true + tags: + - oci-fixed-amd + before_script: + - *prepare_build + - *prepare_www + after_script: + - *prepare_artfacts + script: + - bash builder/build-package alpine 320; + only: + variables: + - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME + artifacts: + paths: + - output/ + +build_alpine_320_arm: + stage: build + allow_failure: true + tags: + - oci-fixed-arm + before_script: + - *prepare_build + - *prepare_www + after_script: + - *prepare_artfacts + script: + - bash builder/build-package alpine 320; + only: + variables: + - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME + artifacts: + paths: + - output/ + upload: stage: upload image: ubuntu:focal diff --git a/builder/dockerfile.alpine_320.apk.build b/builder/dockerfile.alpine_320.apk.build new file mode 100644 index 0000000..d99e67e --- /dev/null +++ b/builder/dockerfile.alpine_320.apk.build @@ -0,0 +1,7 @@ +FROM alpine:3.20 + +RUN apk add shadow bash + +RUN useradd -m docker && echo "docker:docker" | chpasswd + +USER docker diff --git a/builder/dockerfile.alpine_320.build b/builder/dockerfile.alpine_320.build new file mode 100644 index 0000000..609f702 --- /dev/null +++ b/builder/dockerfile.alpine_320.build @@ -0,0 +1,82 @@ +FROM alpine:3.20 + +ENV KASMVNC_BUILD_OS alpine +ENV KASMVNC_BUILD_OS_CODENAME 320 +ENV XORG_VER 1.20.14 + +RUN \ + echo "**** install build deps ****" && \ + apk add \ + alpine-release \ + alpine-sdk \ + autoconf \ + automake \ + bash \ + ca-certificates \ + cmake \ + coreutils \ + curl \ + eudev-dev \ + font-cursor-misc \ + font-misc-misc \ + font-util-dev \ + git \ + grep \ + jq \ + libdrm-dev \ + libepoxy-dev \ + libjpeg-turbo-dev \ + libjpeg-turbo-static \ + libpciaccess-dev \ + libtool \ + libwebp-dev \ + libx11-dev \ + libxau-dev \ + libxcb-dev \ + libxcursor-dev \ + libxcvt-dev \ + libxdmcp-dev \ + libxext-dev \ + libxfont2-dev \ + libxkbfile-dev \ + libxrandr-dev \ + libxshmfence-dev \ + libxtst-dev \ + mesa-dev \ + mesa-dri-gallium \ + meson \ + nettle-dev \ + openssl-dev \ + pixman-dev \ + procps \ + shadow \ + tar \ + tzdata \ + wayland-dev \ + wayland-protocols \ + xcb-util-dev \ + xcb-util-image-dev \ + xcb-util-keysyms-dev \ + xcb-util-renderutil-dev \ + xcb-util-wm-dev \ + xinit \ + xkbcomp \ + xkbcomp-dev \ + xkeyboard-config \ + xorgproto \ + xorg-server-common \ + 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/ + +USER docker +ENTRYPOINT ["/src/builder/build.sh"]