diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e7bb40..4017934 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,7 +108,7 @@ build_ubuntu_jammy: stage: build allow_failure: true tags: - - kasmvnc-x86 + - oci-fixed-amd before_script: - *prepare_build - *prepare_www diff --git a/builder/dockerfile.kali_kali-rolling.deb.build b/builder/dockerfile.kali_kali-rolling.deb.build index 6d0ed1b..3683530 100644 --- a/builder/dockerfile.kali_kali-rolling.deb.build +++ b/builder/dockerfile.kali_kali-rolling.deb.build @@ -3,7 +3,7 @@ FROM kalilinux/kali-rolling:latest ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && \ - apt-get -y install vim build-essential devscripts equivs + apt-get -y install vim build-essential devscripts equivs libavformat-dev libswscale-dev # Install build-deps for the package. COPY ./debian/control /tmp diff --git a/builder/dockerfile.ubuntu_focal.build b/builder/dockerfile.ubuntu_focal.build index a70c56a..57c7373 100644 --- a/builder/dockerfile.ubuntu_focal.build +++ b/builder/dockerfile.ubuntu_focal.build @@ -39,5 +39,5 @@ RUN $SCRIPTS_DIR/build-libjpeg-turbo COPY --chown=docker:docker . /src/ -#USER docker -#ENTRYPOINT ["/src/builder/build.sh"] +USER docker +ENTRYPOINT ["/src/builder/build.sh"]