Skip to content

Commit 5e9a82f

Browse files
committed
build: Update AppImage Dockerfile to Ubuntu 20.04
to get newer openssl required for cryptography pyca/cryptography#8449 we also add `g++` here because the `zxing-cpp` build needs it.
1 parent b13d2cc commit 5e9a82f

File tree

3 files changed

+64
-58
lines changed

3 files changed

+64
-58
lines changed

contrib/build-linux/appimage/Dockerfile_ub1804

Lines changed: 0 additions & 57 deletions
This file was deleted.
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
FROM ubuntu:20.04@sha256:3246518d9735254519e1b2ff35f95686e4a5011c90c85344c1f38df7bae9dd37
2+
3+
ARG UBUNTU_MIRROR=http://archive.ubuntu.com/ubuntu/
4+
5+
ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
6+
7+
ENV UBUNTUDIST=focal
8+
9+
# This prevents questions during package installations
10+
ENV DEBIAN_FRONTEND=noninteractive
11+
12+
# If a package version does not exist anymore you can use "apt-cache policy <pkg>" to display the available versions
13+
RUN echo deb ${UBUNTU_MIRROR} ${UBUNTUDIST} main restricted universe multiverse > /etc/apt/sources.list && \
14+
echo deb ${UBUNTU_MIRROR} ${UBUNTUDIST}-updates main restricted universe multiverse >> /etc/apt/sources.list && \
15+
echo deb ${UBUNTU_MIRROR} ${UBUNTUDIST}-backports main restricted universe multiverse >> /etc/apt/sources.list && \
16+
echo deb ${UBUNTU_MIRROR} ${UBUNTUDIST}-security main restricted universe multiverse >> /etc/apt/sources.list && \
17+
apt-get update -q && \
18+
apt-get install -qy \
19+
git=1:2.25.1-1ubuntu3.11 \
20+
wget=1.20.3-1ubuntu2 \
21+
make=4.2.1-1.2 \
22+
autotools-dev=20180224.1 \
23+
autoconf=2.69-11.1 \
24+
libtool=2.4.6-14 \
25+
xz-utils=5.2.4-1ubuntu1.1 \
26+
libffi-dev=3.3-4 \
27+
libncurses-dev=6.2-0ubuntu2.1 \
28+
libsqlite3-dev=3.31.1-4ubuntu0.5 \
29+
libusb-1.0-0-dev=2:1.0.23-2build1 \
30+
libudev-dev=245.4-4ubuntu3.22 \
31+
gettext=0.19.8.1-10build1 \
32+
pkg-config=0.29.1-0ubuntu4 \
33+
libdbus-1-3=1.12.16-2ubuntu2.3 \
34+
libpcsclite-dev=1.8.26-3 \
35+
swig=4.0.1-5build1 \
36+
libxkbcommon-x11-0=0.10.0-1 \
37+
libxcb1=1.14-2 \
38+
libxcb-icccm4=0.4.1-1.1 \
39+
libxcb-image0=0.4.0-1build1 \
40+
libxcb-keysyms1=0.4.0-1build1 \
41+
libxcb-randr0=1.14-2 \
42+
libxcb-render-util0=0.3.9-1build1 \
43+
libxcb-render0=1.14-2 \
44+
libxcb-shape0=1.14-2 \
45+
libxcb-shm0=1.14-2 \
46+
libxcb-sync1=1.14-2 \
47+
libxcb-util1=0.4.0-0ubuntu3 \
48+
libxcb-xfixes0=1.14-2 \
49+
libxcb-xinerama0=1.14-2 \
50+
libxcb-xkb1=1.14-2 \
51+
libx11-xcb1=2:1.6.9-2ubuntu1.6 \
52+
autopoint=0.19.8.1-10build1 \
53+
zlib1g-dev=1:1.2.11.dfsg-2ubuntu1.5 \
54+
libfreetype6=2.10.1-2ubuntu0.3 \
55+
libfontconfig1=2.13.1-2ubuntu3 \
56+
libssl-dev=1.1.1f-1ubuntu2.20 \
57+
rustc=1.70.0+dfsg0ubuntu1~bpo2-0ubuntu0.20.04.1 \
58+
cargo=1.70.0+dfsg0ubuntu1~bpo2-0ubuntu0.20.04.1 \
59+
g++=4:9.3.0-1ubuntu2 \
60+
&& \
61+
rm -rf /var/lib/apt/lists/* && \
62+
apt-get autoremove -y && \
63+
apt-get clean

contrib/build-linux/appimage/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if [ -z ${SUDO+x} ] ; then
4646
fi
4747
fi
4848

49-
DOCKER_SUFFIX=ub1804
49+
DOCKER_SUFFIX=ub2004
5050

5151
info "Creating docker image ..."
5252
$SUDO docker build --progress plain -t electroncash-appimage-builder-img-$DOCKER_SUFFIX \

0 commit comments

Comments
 (0)