KASM-2119 libjpegt build for 20.04

.gitlab-ci.yml

@@ -51,6 +51,9 @@ build_ubuntu_bionic:
     - *prepare_artfacts
   script:
     - bash builder/build-package ubuntu bionic
+  only:
+    variables:
+      - $CI_COMMIT_MESSAGE =~ /\[full [Cc][Ii]\]/
   artifacts:
     paths:
       - output/
@@ -67,6 +70,9 @@ build_ubuntu_bionic_arm:
     - *prepare_artfacts
   script:
     - bash builder/build-package ubuntu bionic
+  only:
+    variables:
+      - $CI_COMMIT_MESSAGE =~ /\[full [Cc][Ii]\]/
   artifacts:
     paths:
       - output/
@@ -80,7 +86,7 @@ build_ubuntu_bionic_libjpeg_turbo:
   after_script:
     - *prepare_artfacts
   script:
-    - bash builder/build-package ubuntu bionic +libjpeg-turbo_latest
+    - bash builder/build-package ubuntu focal +libjpeg-turbo_latest
   artifacts:
     paths:
       - output/
@@ -114,9 +120,6 @@ build_ubuntu_focal_arm:
     - *prepare_artfacts
   script:
     - bash builder/build-package ubuntu focal;
-  only:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /\[full [Cc][Ii]\]/
   artifacts:
     paths:
       - output/

builder/dockerfile.ubuntu_focal+libjpeg-turbo_latest.build

@@ -1,14 +1,15 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV KASMVNC_BUILD_OS ubuntu
-ENV KASMVNC_BUILD_OS_CODENAME bionic
+ENV KASMVNC_BUILD_OS_CODENAME focal
-ENV XORG_VER 1.20.10
+ENV XORG_VER 1.20.8
 
 RUN sed -i 's$# deb-src$deb-src$' /etc/apt/sources.list
 
 RUN apt-get update && \
       apt-get -y install sudo
 
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
 RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver
 RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev
@@ -25,12 +26,6 @@ RUN cd /tmp/libwebp-1.0.2 && \
     ./configure --enable-static --disable-shared && \
     make && make install
 
-# Fix for older required libs
-#RUN cd /tmp && wget http://launchpadlibrarian.net/347526424/libxfont1-dev_1.5.2-4ubuntu2_amd64.deb && \
-#    wget http://launchpadlibrarian.net/347526425/libxfont1_1.5.2-4ubuntu2_amd64.deb && \
-#    dpkg -i libxfont1_1.5.2-4ubuntu2_amd64.deb && \
-#    dpkg -i libxfont1-dev_1.5.2-4ubuntu2_amd64.deb
-
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 
 COPY --chown=docker:docker . /src

builder/dockerfile.ubuntu_focal+libjpeg-turbo_latest.deb.build

@@ -1,5 +1,7 @@
-FROM ubuntu:bionic
+FROM ubuntu:20.04
 
+RUN apt-get update && \
+      DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && \
       apt-get -y install vim build-essential devscripts equivs
 

builder/dockerfile.ubuntu_focal+libjpeg-turbo_latest.deb.test

@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:20.04
 
 ENV DISPLAY=:1 \
     VNC_PORT=8443 \