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

Favour installing wine64 instead of wine64-development, bump the distribution in the dockerfile #128

Merged
merged 3 commits into from
Apr 19, 2024
Merged

Favour installing wine64 instead of wine64-development, bump the distribution in the dockerfile #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23058ba
docker: Explicilty install xz-utils for unpacking the llvm tarball
mstorsjo Apr 18, 2024
c746838
docker: Update the dockerfile to Ubuntu 22.04
mstorsjo Apr 9, 2024
1026352
Generally favour installing wine64 instead of wine64-development
mstorsjo Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/projects.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- name: Install prerequisites
run: |
sudo apt-get update && sudo apt-get install wine64-development python3 msitools ca-certificates ninja-build winbind meson nasm
sudo apt-get update && sudo apt-get install wine64 python3 msitools ca-certificates ninja-build winbind meson nasm
wine64 wineboot
- uses: actions/checkout@v4
- name: Download MSVC
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
steps:
- name: Install prerequisites
run: |
sudo apt-get update && sudo apt-get install wine64-development python3 msitools ca-certificates winbind nasm
sudo apt-get update && sudo apt-get install wine64 python3 msitools ca-certificates winbind nasm
wine64 wineboot
- uses: actions/checkout@v4
- name: Download MSVC
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
steps:
- name: Install prerequisites
run: |
sudo apt-get update && sudo apt-get install wine64-development python3 msitools ca-certificates cmake ninja-build winbind
sudo apt-get update && sudo apt-get install wine64 python3 msitools ca-certificates cmake ninja-build winbind
wine64 wineboot
- uses: actions/checkout@v4
- name: Download MSVC
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update && \
apt-get install -y wine64-development python3 msitools ca-certificates && \
apt-get install -y wine64 python3 msitools ca-certificates && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.clang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG BASE=msvc-wine
FROM $BASE

RUN apt-get update && \
apt-get install -y curl && \
apt-get install -y curl xz-utils && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ The following instructions are for setting up MSVC without docker.

```bash
apt-get update
apt-get install -y wine64-development python3 msitools ca-certificates winbind
apt-get install -y wine64 python3 msitools ca-certificates winbind
```

## Installation
Expand Down