diff --git a/.changeset/clean-gifts-ring.md b/.changeset/clean-gifts-ring.md new file mode 100644 index 0000000000..e2f532e4d2 --- /dev/null +++ b/.changeset/clean-gifts-ring.md @@ -0,0 +1,5 @@ +--- + +--- + +Revert "feat: Upgrade to Ubuntu 22.04 and python 3.10" due to #7092 #7101 and #7102 diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index ea487ad824..4f84550fae 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:22.04-curl +FROM buildpack-deps:focal-curl ENV DEBIAN_FRONTEND noninteractive @@ -12,7 +12,7 @@ RUN apt-get -qq update && apt-get -qq dist-upgrade && \ # libsecret-1-dev is required even for prebuild keytar (https://atom.github.io/node-keytar/) apt-get -qq install --no-install-recommends \ qtbase5-dev build-essential autoconf libssl-dev gcc-multilib g++-multilib \ - lzip rpm python3.10 libcurl4 git git-lfs ssh unzip libarchive-tools \ + lzip rpm python libcurl4 git git-lfs ssh unzip libarchive-tools \ libxtst6 libsecret-1-dev libopenjp2-tools liblzo2-2 \ && \ # git-lfs @@ -31,4 +31,4 @@ ENV LANGUAGE C.UTF-8 ENV LC_ALL C.UTF-8 ENV DEBUG_COLORS true -ENV FORCE_COLOR true +ENV FORCE_COLOR true \ No newline at end of file diff --git a/docker/wine/Dockerfile b/docker/wine/Dockerfile index 72ed492834..4614183693 100644 --- a/docker/wine/Dockerfile +++ b/docker/wine/Dockerfile @@ -3,14 +3,14 @@ FROM electronuserland/builder:$IMAGE_VERSION RUN dpkg --add-architecture i386 && \ curl -Lo /usr/share/keyrings/winehq.asc https://dl.winehq.org/wine-builds/winehq.key && \ - echo 'deb [signed-by=/usr/share/keyrings/winehq.asc] https://dl.winehq.org/wine-builds/ubuntu/ impish main' > /etc/apt/sources.list.d/winehq.list && \ + echo 'deb [signed-by=/usr/share/keyrings/winehq.asc] https://dl.winehq.org/wine-builds/ubuntu/ focal main' > /etc/apt/sources.list.d/winehq.list && \ apt-get update && \ apt-get install -y --no-install-recommends \ # We can't install `winehq-stable`, we must manually lock each dependency to v6 (ref: https://github.com/electron-userland/electron-builder/issues/6780), - winehq-stable=6.0.4~impish-1 \ - wine-stable=6.0.4~impish-1 \ - wine-stable-i386=6.0.4~impish-1 \ - wine-stable-amd64=6.0.4~impish-1 \ + winehq-stable=6.0.4~focal-1 \ + wine-stable=6.0.4~focal-1 \ + wine-stable-i386=6.0.4~focal-1 \ + wine-stable-amd64=6.0.4~focal-1 \ && \ # clean apt-get clean && rm -rf /var/lib/apt/lists/*