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

Upgrade Dockerfile to Ubuntu 22.04 as 18.04 is EOL #91

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Upgrade Dockerfile to Ubuntu 22.04 as 18.04 is EOL #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
daea151
Upgrade Dockerfile to Ubuntu 22.04 as 18.04 is EOL
MisterSheeple Nov 4, 2023
8f20618
Add missing package that fixes breakage
MisterSheeple Nov 8, 2023
680629e
Make the example command less archaic and easier to read
MisterSheeple Nov 8, 2023
ba50572
Update Docker instructions in README
MisterSheeple Nov 8, 2023
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
7 changes: 4 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
FROM ubuntu:18.04 as build
FROM ubuntu:22.04 as build

RUN apt-get update && \
apt-get install -y \
binutils-mips-linux-gnu \
bsdextrautils \
build-essential \
git \
pkgconf \
Expand All @@ -12,5 +13,5 @@ RUN mkdir /sm64
WORKDIR /sm64
ENV PATH="/sm64/tools:${PATH}"

CMD echo 'usage: docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64 make VERSION=us -j4\n' \
'see https://github.com/n64decomp/sm64/blob/master/README.md for advanced usage'
CMD echo 'Usage: docker run --rm -v ${PWD}:/sm64 sm64 make VERSION=us -j4\n' \
'See https://github.com/n64decomp/sm64/blob/master/README.md for more information'
10 changes: 2 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,9 @@ docker build -t sm64 .

To build, mount the local filesystem into the Docker container and build the ROM with `docker run sm64 make`.

##### macOS example for (U):
##### Example:
```
docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64 make VERSION=us -j4
```

##### Linux example for (U):
For a Linux host, Docker needs to be instructed which user should own the output files:
```
docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 --user $UID:$GID sm64 make VERSION=us -j4
docker run --rm -v ${PWD}:/sm64 sm64 make VERSION=us -j4
```

Resulting artifacts can be found in the `build` directory.
Expand Down