update dockerfile, yeet yarn, use pnpm

This commit is contained in:
Anthony Cicchetti 2022-04-28 18:50:24 -04:00
parent 721b313835
commit 4f5b361409
3 changed files with 6 additions and 7 deletions

View file

@ -30,11 +30,10 @@ RUN premake5 gmake && cd build/gmake && make config=release_${ARCH}
FROM base FROM base
# NodeJS >= 12.16.0 # NodeJS >= 12.16.0
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - RUN curl -sL https://deb.nodesource.com/setup_lts.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 apt-get update 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 / WORKDIR /
ADD ./private-build-plans.toml / ADD ./private-build-plans.toml /

View file

@ -6,8 +6,8 @@ git clone --single-branch --depth=1 https://github.com/be5invis/Iosevka
cp private-build-plans.toml ./Iosevka cp private-build-plans.toml ./Iosevka
cd /Iosevka cd /Iosevka
npm install pnpm install
npm run build -- super-ttc::iosevka-acicchetti pnpm run build -- super-ttc::iosevka-acicchetti
cd dist/.super-ttc cd dist/.super-ttc
tar cvf iosevka-acicchetti-$(date -I).tzst --zstd *.ttc tar cvf iosevka-acicchetti-$(date -I).tzst --zstd *.ttc

View file

@ -5,7 +5,7 @@ BYPASS4NS := if env_var_or_default("USE_LIMA", "no") == "yes" { "--label nerdctl
ARCH := if arch() == "aarch64" { "arm64" } else { "x64" } ARCH := if arch() == "aarch64" { "arm64" } else { "x64" }
docker-build: docker-update 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: docker-build
{{ DOCKER }} run -it {{ BYPASS4NS }} iosevka {{ DOCKER }} run -it {{ BYPASS4NS }} iosevka