From 2bc3a0448725c849d783ff86cb81f00c6ec35793 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 24 Oct 2023 20:39:37 -0400 Subject: [PATCH 1/3] Add Dockerfile --- Dockerfile | 26 ++++++++++++++++++++++++++ INSTALL.md | 8 ++++++++ 2 files changed, 34 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000..a9c56ac9a5 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,26 @@ +FROM ubuntu:jammy + +RUN apt-get update -y +RUN apt-get install -y \ + git \ + build-essential \ + pkg-config \ + python3 \ + python3-venv \ + python3-pip \ + python-is-python3 \ + wget +RUN dpkg --add-architecture i386 +RUN mkdir -pm755 /etc/apt/keyrings +RUN wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key +RUN wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/winehq-jammy.sources +RUN apt-get update -y +RUN apt-get install -y --install-recommends winehq-stable +RUN python -m venv .venv +RUN . .venv/bin/activate +RUN pip install meson ninja +COPY tools/cw/license.dat /etc/mwerks/license.dat +ENV LM_LICENSE_FILE=/etc/mwerks/license.dat +RUN hash -r + +CMD [ "/bin/sh" ] diff --git a/INSTALL.md b/INSTALL.md index efca3c4901..9fa2234377 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -153,3 +153,11 @@ To build the rom, run: If everything works, then the following ROM should be built: - [build/pokeplatinum.us.nds](https://datomatic.no-intro.org/index.php?page=show_record&s=28&n=3541) `sha1: ce81046eda7d232513069519cb2085349896dec7` + +# 4. Docker + +A Dockerfile is provided for your convenience. To begin, setup docker on your local machine following the instructions at https://docker.io. Then, run + + ./clean.sh + docker build . -t oret/pokeplatinum + docker run -w /rom -v .:/rom pret/pokeplatinum sh -c "./config.sh && ./build.sh" From cdf61eb97916e1af967244f2d97d7e2b7e0bbdb4 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 24 Oct 2023 20:41:46 -0400 Subject: [PATCH 2/3] Typo fix --- INSTALL.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 9fa2234377..225fa71ea0 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -108,7 +108,7 @@ These can be installed using Homebrew; if you do not have Homebrew installed, re ``` brew update -brew install meson +brew install meson brew install --cask wine-stable ``` @@ -156,8 +156,8 @@ If everything works, then the following ROM should be built: # 4. Docker -A Dockerfile is provided for your convenience. To begin, setup docker on your local machine following the instructions at https://docker.io. Then, run +A Dockerfile is provided for your convenience. To begin, setup docker on your local machine following the instructions at https://docs.docker.com/desktop/. Then, run ./clean.sh - docker build . -t oret/pokeplatinum + docker build . -t pret/pokeplatinum docker run -w /rom -v .:/rom pret/pokeplatinum sh -c "./config.sh && ./build.sh" From 78024672bb7460a7c2109bac51d90220f09df283 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 24 Oct 2023 22:17:06 -0400 Subject: [PATCH 3/3] Update INSTALL.md --- INSTALL.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 225fa71ea0..2bf4594a39 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -158,6 +158,8 @@ If everything works, then the following ROM should be built: A Dockerfile is provided for your convenience. To begin, setup docker on your local machine following the instructions at https://docs.docker.com/desktop/. Then, run - ./clean.sh + ./clean.sh # because we are switching environments docker build . -t pret/pokeplatinum - docker run -w /rom -v .:/rom pret/pokeplatinum sh -c "./config.sh && ./build.sh" + docker run -u $USER -w /rom -v .:/rom pret/pokeplatinum ./config.sh # first time only + docker run -u $USER -w /rom -v .:/rom pret/pokeplatinum ./build.sh + docker run -u $USER -w /rom -v .:/rom pret/pokeplatinum ./clean.sh # before switching environments