diff --git a/builder/build-deb-inside-docker b/builder/build-deb-inside-docker index 0707dc5..faca5d0 100755 --- a/builder/build-deb-inside-docker +++ b/builder/build-deb-inside-docker @@ -8,7 +8,6 @@ os=$(lsb_release -is | tr '[:upper:]' '[:lower:]') os_codename=$(lsb_release -cs) os_dir="builder/build/${os_codename}" -export LD_LIBRARY_PATH="/opt/libjpeg-turbo/lib64/:$LD_LIBRARY_PATH" dpkg-buildpackage -us -uc -b mkdir -p "$os_dir" cp ../*.deb "$os_dir" diff --git a/builder/dockerfile.ubuntu_bionic.build b/builder/dockerfile.ubuntu_bionic.build index 42837ca..d95bd02 100644 --- a/builder/dockerfile.ubuntu_bionic.build +++ b/builder/dockerfile.ubuntu_bionic.build @@ -10,12 +10,8 @@ RUN apt-get update && \ apt-get -y install sudo 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 - -RUN apt-get update && apt-get install -y cmake nasm gcc -RUN git clone https://github.com/libjpeg-turbo/libjpeg-turbo.git -RUN export MAKEFLAGS=-j`nproc`; cd libjpeg-turbo && cmake -DCMAKE_INSTALL_PREFIX=/usr/local -G"Unix Makefiles" && make && make install +RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver +RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev # Additions for webp RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz diff --git a/builder/dockerfile.ubuntu_bionic.deb.build b/builder/dockerfile.ubuntu_bionic.deb.build index 945b069..ac48856 100644 --- a/builder/dockerfile.ubuntu_bionic.deb.build +++ b/builder/dockerfile.ubuntu_bionic.deb.build @@ -5,8 +5,6 @@ RUN apt-get update && \ # Install build-deps for the package. COPY ./debian/control /tmp -COPY ./libjpeg-turbo_2.1.1_amd64.deb /tmp -RUN apt-get install /tmp/libjpeg-turbo*deb RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control USER 1000 diff --git a/builder/dockerfile.ubuntu_bionic.deb.test b/builder/dockerfile.ubuntu_bionic.deb.test index c64f0bd..793c2ca 100644 --- a/builder/dockerfile.ubuntu_bionic.deb.test +++ b/builder/dockerfile.ubuntu_bionic.deb.test @@ -42,9 +42,6 @@ COPY startup/ $STARTUPDIR ### START CUSTOM STUFF #### ARG KASMVNC_PACKAGE_DIR -COPY $KASMVNC_PACKAGE_DIR/libjpeg-turbo_2.1.1_amd64.deb /tmp -RUN apt-get install /tmp/libjpeg-turbo*deb - COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp RUN dpkg -i /tmp/*.deb; apt-get -yf install diff --git a/builder/startup/vnc_startup.sh b/builder/startup/vnc_startup.sh index edaf969..c0c3b3c 100755 --- a/builder/startup/vnc_startup.sh +++ b/builder/startup/vnc_startup.sh @@ -2,8 +2,6 @@ ### every exit != 0 fails the script set -e -export LD_LIBRARY_PATH="/opt/libjpeg-turbo/lib64/:$LD_LIBRARY_PATH" - # should also source $STARTUPDIR/generate_container_user source $HOME/.bashrc diff --git a/debian/shlibs.local b/debian/shlibs.local deleted file mode 100644 index a5abe9e..0000000 --- a/debian/shlibs.local +++ /dev/null @@ -1 +0,0 @@ -libjpeg 62 libjpeg-turbo (>= 2.1.1)