Merge branch 'feature/KASM-5403-fedora-39' into 'master'

Resolve KASM-5403 "Feature/ fedora 39"

Closes KASM-5403

See merge request kasm-technologies/internal/KasmVNC!119
This commit is contained in:
Matthew McClaskey 2024-01-03 17:02:12 +00:00
commit 408fcd3415
3 changed files with 175 additions and 37 deletions

View File

@ -11,7 +11,8 @@ variables:
# arm builds, because build_debian_buster_arm matches build_debian_buster. # arm builds, because build_debian_buster_arm matches build_debian_buster.
# "BUILD_JOBS: none" won't build any build jobs, nor www. # "BUILD_JOBS: none" won't build any build jobs, nor www.
BUILD_JOBS: all BUILD_JOBS: all
DOCKER_HOST: unix:// DOCKER_HOST: tcp://docker:2375
DOCKER_TLS_CERTDIR: ""
workflow: workflow:
rules: rules:
@ -38,13 +39,13 @@ stages:
default: default:
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
build_www: build_www:
stage: www stage: www
allow_failure: false allow_failure: false
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
script: script:
@ -69,7 +70,7 @@ build_ubuntu_bionic:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -88,7 +89,7 @@ build_ubuntu_bionic_arm:
stage: build stage: build
allow_failure: false allow_failure: false
tags: tags:
- oci-fixed-arm64 - oci-fixed-arm
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -107,7 +108,7 @@ build_ubuntu_focal:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -126,7 +127,7 @@ build_ubuntu_focal_arm:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-arm64 - oci-fixed-arm
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -145,7 +146,7 @@ build_ubuntu_jammy:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -164,7 +165,7 @@ build_ubuntu_jammy_arm:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-arm64 - oci-fixed-arm
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -183,7 +184,7 @@ build_debian_buster:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -202,7 +203,7 @@ build_debian_buster_arm:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-arm64 - oci-fixed-arm
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -221,7 +222,7 @@ build_debian_bullseye:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -240,7 +241,7 @@ build_debian_bullseye_arm:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-arm64 - oci-fixed-arm
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -260,7 +261,7 @@ build_debian_bookworm:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -279,7 +280,7 @@ build_debian_bookworm_arm:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-arm64 - oci-fixed-arm
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -298,7 +299,7 @@ build_kali_rolling:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -317,7 +318,7 @@ build_kali_rolling_arm:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-arm64 - oci-fixed-arm
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -336,7 +337,7 @@ build_centos7:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -355,7 +356,7 @@ build_oracle_8:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -374,7 +375,7 @@ build_oracle_8_arm:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-arm64 - oci-fixed-arm
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -393,7 +394,7 @@ build_oracle_9:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -412,7 +413,7 @@ build_oracle_9_arm:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-arm64 - oci-fixed-arm
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -431,7 +432,7 @@ build_opensuse_15:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -450,7 +451,7 @@ build_opensuse_15_arm:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-arm64 - oci-fixed-arm
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -469,7 +470,7 @@ build_fedora_thirtyseven:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -488,7 +489,7 @@ build_fedora_thirtyseven_arm:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-arm64 - oci-fixed-arm
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -507,7 +508,7 @@ build_fedora_thirtyeight:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -526,7 +527,7 @@ build_fedora_thirtyeight_arm:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-arm64 - oci-fixed-arm
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -541,11 +542,49 @@ build_fedora_thirtyeight_arm:
paths: paths:
- output/ - output/
build_fedora_thirtynine:
stage: build
allow_failure: true
tags:
- oci-fixed-amd
before_script:
- *prepare_build
- *prepare_www
after_script:
- *prepare_artfacts
script:
- bash builder/build-package fedora thirtynine;
only:
variables:
- $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
artifacts:
paths:
- output/
build_fedora_thirtynine_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 fedora thirtynine;
only:
variables:
- $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
artifacts:
paths:
- output/
build_alpine_317: build_alpine_317:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -564,7 +603,7 @@ build_alpine_317_arm:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-arm64 - oci-fixed-arm
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -582,7 +621,7 @@ build_alpine_317_arm:
test: test:
stage: test stage: test
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
script: script:
@ -593,7 +632,7 @@ build_alpine_318:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -612,7 +651,7 @@ build_alpine_318_arm:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-arm64 - oci-fixed-arm
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -631,7 +670,7 @@ build_alpine_319:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -650,7 +689,7 @@ build_alpine_319_arm:
stage: build stage: build
allow_failure: true allow_failure: true
tags: tags:
- oci-fixed-arm64 - oci-fixed-arm
before_script: before_script:
- *prepare_build - *prepare_build
- *prepare_www - *prepare_www
@ -669,7 +708,7 @@ upload:
stage: upload stage: upload
image: ubuntu:focal image: ubuntu:focal
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
artifacts: artifacts:
paths: paths:
- output/ - output/
@ -708,7 +747,7 @@ upload_build_preview:
dependencies: ["upload"] dependencies: ["upload"]
image: ubuntu:focal image: ubuntu:focal
tags: tags:
- oci-fixed-amd64 - oci-fixed-amd
before_script: before_script:
- . .ci/upload.sh - . .ci/upload.sh
resource_group: upload_build_preview resource_group: upload_build_preview

View File

@ -0,0 +1,86 @@
FROM fedora:39
ENV KASMVNC_BUILD_OS fedora
ENV KASMVNC_BUILD_OS_CODENAME thirtynine
ENV XORG_VER 1.20.14
RUN \
echo "**** install build deps ****" && \
dnf group install -y \
"C Development Tools and Libraries" \
"Development Tools" && \
dnf install -y \
autoconf \
automake \
bison \
byacc \
bzip2 \
cmake \
diffutils \
doxygen \
file \
flex \
fop \
gcc \
gcc-c++ \
git \
glibc-devel \
libdrm-devel \
libepoxy-devel \
libmd-devel \
libpciaccess-devel \
libtool \
libwebp-devel \
libX11-devel \
libXau-devel \
libxcb-devel \
libXcursor-devel \
libxcvt-devel \
libXdmcp-devel \
libXext-devel \
libXfont2-devel \
libxkbfile-devel \
libXrandr-devel \
libxshmfence-devel \
libXtst-devel \
mesa-libEGL-devel \
mesa-libgbm-devel \
mesa-libGL-devel \
meson \
mingw64-binutils \
mt-st \
nettle-devel \
openssl-devel \
patch \
pixman-devel \
wayland-devel \
wget \
which \
xcb-util-devel \
xcb-util-image-devel \
xcb-util-keysyms-devel \
xcb-util-renderutil-devel \
xcb-util-wm-devel \
xinit \
xkbcomp \
xkbcomp-devel \
xkeyboard-config \
xmlto \
xorg-x11-font-utils \
xorg-x11-proto-devel \
xorg-x11-server-common \
xorg-x11-server-devel \
xorg-x11-xtrans-devel \
xsltproc
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"]

View File

@ -0,0 +1,13 @@
FROM fedora:39
RUN dnf install -y fedora-packager fedora-review
RUN dnf install -y tree vim less
RUN dnf install -y redhat-lsb-core
RUN dnf install -y dnf-plugins-core
COPY fedora/*.spec /tmp
RUN dnf builddep -y /tmp/*.spec
RUN useradd -m docker && echo "docker:docker" | chpasswd
USER docker