Skip to content

Commit

Permalink
fix build scripts
Browse files Browse the repository at this point in the history
A sudo is needed to build the wine docker image, or else the wineserver is hanging forever when running
```
 RUN wineboot && \
    /tmp/winetricks --optout -q dotnet472 && \
    # Wait for the wine server to shutdown, needs to be done after wineboot to ensure the installation is good
    wineserver -w
```

A couple of lib versions need to be bumped for the AppImage build, as the previous versions are no longer available in the repository.
  • Loading branch information
PiRK committed Jun 19, 2023
1 parent 39e4d75 commit 9b72b3e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions contrib/build-linux/appimage/Dockerfile_ub1804
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN echo deb ${UBUNTU_MIRROR} bionic main restricted universe multiverse > /etc/
libtool=2.4.6-2 \
xz-utils=5.2.2-1.3 \
libffi-dev=3.2.1-8 \
libncurses5-dev=6.1-1ubuntu1.18.04 \
libncurses5-dev=6.1-1ubuntu1.18.04.1 \
libsqlite3-dev=3.22.0-1ubuntu0.7 \
libusb-1.0-0-dev=2:1.0.21-2 \
libudev-dev=237-3ubuntu10.57 \
Expand Down Expand Up @@ -47,7 +47,7 @@ RUN echo deb ${UBUNTU_MIRROR} bionic main restricted universe multiverse > /etc/
zlib1g-dev=1:1.2.11.dfsg-0ubuntu2 \
libfreetype6=2.8.1-2ubuntu2.2 \
libfontconfig1=2.12.6-0ubuntu2 \
libssl-dev=1.1.1-1ubuntu2.1~18.04.22 \
libssl-dev=1.1.1-1ubuntu2.1~18.04.23 \
rustc=1.65.0+dfsg0ubuntu1~llvm2-0ubuntu0.18.04 \
cargo=0.66.0+ds0ubuntu0.libgit2-0ubuntu0.18.04 \
&& \
Expand Down
2 changes: 1 addition & 1 deletion contrib/build-wine/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ GROUP_ID=$(id -g $USER)
IMGNAME="ec-wine-builder-img_${USER_ID}_${GROUP_ID}"

info "Creating docker image ..."
docker build -t $IMGNAME \
sudo docker build -t $IMGNAME \
--build-arg USER_ID=$USER_ID \
--build-arg GROUP_ID=$GROUP_ID \
--build-arg UBUNTU_MIRROR=$UBUNTU_MIRROR \
Expand Down

0 comments on commit 9b72b3e

Please sign in to comment.