From 03cc9b96e0be07ef3450e3992eafcb7fe903a853 Mon Sep 17 00:00:00 2001
From: relativisticelectron
 <60378539+relativisticelectron@users.noreply.github.com>
Date: Tue, 7 Jun 2022 17:25:48 +0200
Subject: [PATCH] feat: Upgrade docker images to Ubuntu 22.04 and python 3.10
 (#6922)

---
 .changeset/clever-cougars-sort.md |  5 +++++
 docker/base/Dockerfile            |  6 +++---
 docker/wine/Dockerfile            | 10 +++++-----
 3 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/clever-cougars-sort.md

diff --git a/.changeset/clever-cougars-sort.md b/.changeset/clever-cougars-sort.md
new file mode 100644
index 0000000000..d3fa655a37
--- /dev/null
+++ b/.changeset/clever-cougars-sort.md
@@ -0,0 +1,5 @@
+---
+
+---
+
+feat: Upgrade to dockerfile to use base Ubuntu 22.04 and python 3.10
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index 4f84550fae..ea487ad824 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:focal-curl
+FROM buildpack-deps:22.04-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 python libcurl4 git git-lfs ssh unzip libarchive-tools \
+        lzip rpm python3.10 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
\ No newline at end of file
+ENV FORCE_COLOR true
diff --git a/docker/wine/Dockerfile b/docker/wine/Dockerfile
index 4614183693..72ed492834 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/ focal main' > /etc/apt/sources.list.d/winehq.list && \
+  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 && \
   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~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 \
+    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  \
   && \
   # clean
   apt-get clean && rm -rf /var/lib/apt/lists/*