Skip to content

Commit f35fef4

Browse files
committed
[electrum] update dockerfiles to unbreak the release build
Summary: Some previous versions of packages are no longer in the Ubuntu repositories, making the release scripts fail. I don't plan to do a release soon, but I'd like to be able to test release scripts in the test plan of other diffs. Test Plan: Run the build scripts and check that the "Creating Docker" stage succeeds ``` contrib/build-linux/appimage/build.sh contrib/build-wine/build.sh ``` Reviewers: #bitcoin_abc, roqqit Reviewed By: roqqit Differential Revision: https://reviews.bitcoinabc.org/D16667
1 parent 9c84e16 commit f35fef4

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

electrum/contrib/build-linux/appimage/Dockerfile_ub2004

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ RUN echo deb ${UBUNTU_MIRROR} ${UBUNTU_DIST} main restricted universe multiverse
1414
echo deb ${UBUNTU_MIRROR} ${UBUNTU_DIST}-security main restricted universe multiverse >> /etc/apt/sources.list && \
1515
apt-get update -q && \
1616
apt-get install -qy \
17-
git=1:2.25.1-1ubuntu3.11 \
18-
wget=1.20.3-1ubuntu2 \
17+
git=1:2.25.1-1ubuntu3.13 \
18+
wget=1.20.3-1ubuntu2.1 \
1919
make=4.2.1-1.2 \
2020
autotools-dev=20180224.1 \
2121
autoconf=2.69-11.1 \
@@ -51,11 +51,11 @@ RUN echo deb ${UBUNTU_MIRROR} ${UBUNTU_DIST} main restricted universe multiverse
5151
zlib1g-dev=1:1.2.11.dfsg-2ubuntu1.5 \
5252
libfreetype6=2.10.1-2ubuntu0.3 \
5353
libfontconfig1=2.13.1-2ubuntu3 \
54-
libssl-dev=1.1.1f-1ubuntu2.21 \
54+
libssl-dev=1.1.1f-1ubuntu2.23 \
5555
gcc-9=9.4.0-1ubuntu1~20.04.2 \
5656
g++=4:9.3.0-1ubuntu2 \
57-
rustc=1.72.1+dfsg0ubuntu1~bpo0-0ubuntu0.20.04 \
58-
cargo=1.72.1+dfsg0ubuntu1~bpo0-0ubuntu0.20.04 \
57+
rustc=1.75.0+dfsg0ubuntu1~bpo0-0ubuntu0.20.04 \
58+
cargo=1.75.0+dfsg0ubuntu1~bpo0-0ubuntu0.20.04 \
5959
&& \
6060
ln -sf /usr/bin/x86_64-linux-gnu-gcc-9 /usr/bin/gcc && \
6161
ln -sf /usr/bin/x86_64-linux-gnu-gcc-9 /usr/bin/cc && \

electrum/contrib/build-wine/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN echo deb ${UBUNTU_MIRROR} ${UBUNTUDIST} main restricted universe multiverse
1919
gnupg2=2.2.27-3ubuntu2.1 \
2020
ca-certificates=20211016 \
2121
wget=1.21.2-2ubuntu1 \
22-
git=1:2.34.1-1ubuntu1.9 \
22+
git=1:2.34.1-1ubuntu1.11 \
2323
p7zip-full=16.02+dfsg-8 \
2424
make=4.3-4.1build1 \
2525
autotools-dev=20220109.1 \
@@ -51,7 +51,7 @@ RUN echo "78b185fabdb323971d13bd329fefc8038e08559aa51c4996de18db0639a51df6 /tmp/
5151
# cabextract is needed for winetricks to install the .NET framework
5252
cabextract=1.9-3 \
5353
# xvfb is needed to launch the Visual Studio installer
54-
xvfb=2:21.1.4-2ubuntu1.7~22.04.8 \
54+
xvfb=2:21.1.4-2ubuntu1.7~22.04.11 \
5555
# winbind is needed for the Visual Studio installer and cl.exe PDB generation
5656
winbind=2:4.15.13+dfsg-0ubuntu1.6
5757

0 commit comments

Comments
 (0)