Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Revert "feat: Upgrade to Ubuntu 22.04 and python 3.10" #7109

Merged
merged 2 commits into from Sep 1, 2022
Merged

fix: Revert "feat: Upgrade to Ubuntu 22.04 and python 3.10" #7109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a1cc25
Revert "feat: Upgrade docker images to Ubuntu 22.04 and python 3.10 (…
mmaietta Sep 1, 2022
1155ae3
Create clean-gifts-ring.md
mmaietta Sep 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/clean-gifts-ring.md
View file
Open in desktop
@@ -0,0 +1,5 @@
---

---

Revert "feat: Upgrade to Ubuntu 22.04 and python 3.10" due to #7092 #7101 and #7102
6 changes: 3 additions & 3 deletions docker/base/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM buildpack-deps:22.04-curl
FROM buildpack-deps:focal-curl

ENV DEBIAN_FRONTEND noninteractive

Expand All @@ -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
Expand All @@ -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
10 changes: 5 additions & 5 deletions docker/wine/Dockerfile
View file
Open in desktop
Expand Up @@ -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/*
Expand Down