diff --git a/Makefile b/Makefile index 59a7600328ac64ccd5a473ad9a243272529f84f3..75c81928c693ab1f3b7e9228a24301fc5ba4b989 100644 --- a/Makefile +++ b/Makefile @@ -165,6 +165,7 @@ DISTRIBUTIONS := \ ubuntu_20.04 \ ubuntu_21.04 \ ubuntu_21.10 \ + ubuntu_22.04 \ fedora_33 \ fedora_34 \ fedora_35 \ diff --git a/docker/Dockerfile_ubuntu_22.04 b/docker/Dockerfile_ubuntu_22.04 new file mode 100644 index 0000000000000000000000000000000000000000..957dd686756e476cc1ae999679b90ae2159c95cc --- /dev/null +++ b/docker/Dockerfile_ubuntu_22.04 @@ -0,0 +1,29 @@ +FROM ubuntu:22.04 + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get clean +RUN apt-get update && \ + apt-get install -y -o Acquire::Retries=10 \ + devscripts \ + equivs \ + python-is-python3 \ + wget + +ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh + +COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control +RUN /opt/prebuild-package-debian.sh qt-deps + +COPY packaging/rules/debian/control /tmp/builddeps/debian/control +RUN /opt/prebuild-package-debian.sh jami-deps + +# Install CMake 3.19 for Qt 6 +ADD scripts/install-cmake.sh /opt/install-cmake.sh +RUN /opt/install-cmake.sh +# nodejs +RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - +RUN apt install nodejs -y + +ADD scripts/build-package-debian.sh /opt/build-package-debian.sh +CMD ["/opt/build-package-debian.sh"] diff --git a/packaging/rules/debian/jami-all.postinst b/packaging/rules/debian/jami-all.postinst index e2267b10c0023e25f2e7964f2c242852c4673ab9..28a72969449bec76cdbba16118e9eb22be51b910 100755 --- a/packaging/rules/debian/jami-all.postinst +++ b/packaging/rules/debian/jami-all.postinst @@ -105,6 +105,8 @@ if [ -f /etc/os-release ]; then ENDTAG="ubuntu_21.04" elif [ "${UBUNTU_CODENAME}" = "impish" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_21.10" ]; then ENDTAG="ubuntu_21.10" + elif [ "${UBUNTU_CODENAME}" = "jammy" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.04" ]; then + ENDTAG="ubuntu_22.04" elif [ "${ID}" = "debian" ] && \ [ "$(command -v lsb_release)" ] && \ [ "$(lsb_release -rs)" = "testing" ]; then