update dockerfile, yeet yarn, use pnpm
This commit is contained in:
parent
721b313835
commit
4f5b361409
3 changed files with 6 additions and 7 deletions
|
@ -30,11 +30,10 @@ RUN premake5 gmake && cd build/gmake && make config=release_${ARCH}
|
|||
|
||||
FROM base
|
||||
# NodeJS >= 12.16.0
|
||||
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
|
||||
RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
|
||||
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
|
||||
RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash -
|
||||
RUN apt-get update
|
||||
RUN apt-get install -y nodejs ttfautohint magic-wormhole zstd yarn
|
||||
RUN apt-get install -y nodejs ttfautohint magic-wormhole zstd
|
||||
RUN npm i -g pnpm
|
||||
|
||||
WORKDIR /
|
||||
ADD ./private-build-plans.toml /
|
||||
|
|
4
build.sh
4
build.sh
|
@ -6,8 +6,8 @@ git clone --single-branch --depth=1 https://github.com/be5invis/Iosevka
|
|||
cp private-build-plans.toml ./Iosevka
|
||||
|
||||
cd /Iosevka
|
||||
npm install
|
||||
npm run build -- super-ttc::iosevka-acicchetti
|
||||
pnpm install
|
||||
pnpm run build -- super-ttc::iosevka-acicchetti
|
||||
|
||||
cd dist/.super-ttc
|
||||
tar cvf iosevka-acicchetti-$(date -I).tzst --zstd *.ttc
|
||||
|
|
2
justfile
2
justfile
|
@ -5,7 +5,7 @@ BYPASS4NS := if env_var_or_default("USE_LIMA", "no") == "yes" { "--label nerdctl
|
|||
ARCH := if arch() == "aarch64" { "arm64" } else { "x64" }
|
||||
|
||||
docker-build: docker-update
|
||||
{{ DOCKER }} {{ BUILDX }} build --build-arg ARCH="{{ARCH}}" -t iosevka .
|
||||
{{ DOCKER }} build --build-arg ARCH="{{ARCH}}" -t iosevka .
|
||||
|
||||
docker-run: docker-build
|
||||
{{ DOCKER }} run -it {{ BYPASS4NS }} iosevka
|
||||
|
|
Loading…
Add table
Reference in a new issue