Skip to content
Snippets Groups Projects
Unverified Commit 6b53758f authored by Amin Bandali's avatar Amin Bandali
Browse files

packaging: remove EOL ubuntu 20.10

Change-Id: I10a69b2026f6e6aa963ffaa95702c0c58c39d216
parent fc93786a
No related branches found
No related tags found
No related merge requests found
FROM ubuntu:20.10
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get clean
RUN apt-get update && \
apt-get install -y -o Acquire::Retries=10 \
devscripts \
equivs \
wget
# add deb-src entries (needed for next step)
RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
RUN apt-get clean && apt-get update
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
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
CMD ["/opt/build-package-debian.sh"]
...@@ -104,8 +104,6 @@ if [ -f /etc/os-release ]; then ...@@ -104,8 +104,6 @@ if [ -f /etc/os-release ]; then
ENDTAG="ubuntu_18.04" ENDTAG="ubuntu_18.04"
elif [ "${UBUNTU_CODENAME}" = "focal" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_20.04" ]; then elif [ "${UBUNTU_CODENAME}" = "focal" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_20.04" ]; then
ENDTAG="ubuntu_20.04" ENDTAG="ubuntu_20.04"
elif [ "${UBUNTU_CODENAME}" = "groovy" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_20.10" ]; then
ENDTAG="ubuntu_20.10"
elif [ "${UBUNTU_CODENAME}" = "hirsute" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_21.04" ]; then elif [ "${UBUNTU_CODENAME}" = "hirsute" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_21.04" ]; then
ENDTAG="ubuntu_21.04" ENDTAG="ubuntu_21.04"
elif [ "${ID}" = "debian" ] && \ elif [ "${ID}" = "debian" ] && \
......
...@@ -170,11 +170,6 @@ def run_generate_all(parsed_args): ...@@ -170,11 +170,6 @@ def run_generate_all(parsed_args):
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS, "options": DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS,
}, },
{
"distribution": "ubuntu_20.10",
"output_file": "$(DEBIAN_DSC_FILENAME)",
"options": DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS,
},
{ {
"distribution": "ubuntu_21.04", "distribution": "ubuntu_21.04",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment