change it up

.github/workflows/img.yml

@@ -19,17 +19,16 @@ jobs:
       - uses: docker/setup-buildx-action@v3
       - uses: docker/build-push-action@v6
         with:
-          tags: img
-          file: img.Dockerfile
+          tags: builder
+          target: img
           push: false
       - uses: addnab/docker-run-action@v3
         with:
-          image: img
-          options: -v ${{ github.ref_name }} -n
+          image: builder
       - uses: shrink/actions-docker-extract@v3
         id: extract
         with:
-          image: img
+          image: builder
           path: /app/.
           destination: .
       - name: push

.github/workflows/pub.yml

@@ -32,17 +32,17 @@ jobs:
       - uses: docker/setup-buildx-action@v3
       - uses: docker/build-push-action@v6
         with:
-          tags: build
-          file: img.Dockerfile
+          tags: builder
+          target: build
           push: false
       - uses: addnab/docker-run-action@v3
         with:
-          image: build
-          options: -v ${{ github.ref_name }} -n
+          image: builder
+          options: -e ARGS='-v ${{ github.ref_name }} -n'
       - uses: shrink/actions-docker-extract@v3
         id: extract
         with:
-          image: build
+          image: builder
           path: /app/out/.
           destination: out
       - name: release

build.Dockerfile → Dockerfile

@@ -1,13 +1,22 @@
 FROM greyltc/archlinux-aur:paru AS deps
-WORKDIR /app
 
-RUN aur-install fontforge bdfresize xfonts-bdftopcf woff2 zip
+WORKDIR /app
+COPY . .
 
 ENV JAVA_HOME=/opt/java/openjdk
 COPY --from=eclipse-temurin:23-jre $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 
-FROM deps
-COPY . .
-ENTRYPOINT ["./build.sh"]
+FROM deps AS build
+
+RUN aur-install fontforge bdfresize xfonts-bdftopcf woff2 zip
+
+CMD ["./build.sh ${ARGS}"]
+
+
+FROM deps AS img
+
+RUN aur-install harfbuzz-utils
+
+CMD ["./img.sh"]

README.md

@@ -11,7 +11,6 @@
 - [Gallery](#gallery)
 - [Installation](#installation)
   - [Web](#web)
-  - [Manually Building](#manually-building)
 - [Design Notes](#design-notes)
   - [Flourishes](#flourishes)
   - [Gaps](#gaps)
@@ -102,12 +101,6 @@ convenience.
 />
 ```
 
-### Manually Building
-
-Requirements:
-
-- Docker
-
 ## Design Notes
 
 Unlike my previous font [eldur](https://github.com/molarmanful/eldur), which

build.sh

@@ -24,7 +24,6 @@ cp LICENSE out
 cp AUTHORS out
 
 bnp_dep
-ff_dep
 nerd_dep
 
 cp src/kirsch.bdf out