Merge pull request #4 from theleagueof/docker

Dockerfile

@@ -0,0 +1,49 @@
+FROM archlinux AS fontship-base
+
+# Setup Caleb's hosted Arch repository with prebuilt dependencies
+RUN pacman-key --init && pacman-key --populate
+RUN sed -i  /etc/pacman.conf -e \
+	'/^.community/{n;n;s!^!\n\[alerque\]\nServer = https://arch.alerque.com/$arch\n!}'
+RUN pacman-key --recv-keys 63CC496475267693 && pacman-key --lsign-key 63CC496475267693
+
+# Freshen all base system packages
+RUN pacman --needed --noconfirm -Syuq && yes | pacman -Sccq
+
+# Install fontship run-time dependecies
+RUN pacman --needed --noconfirm -Syq \
+		font-v git make python zsh \
+		python-{ufonormalizer,font{make,tools}} \
+	&& yes | pacman -Sccq
+
+# Setup separate image to build fontship so we don't bloat the final image
+FROM fontship-base AS fontship-builder
+
+# Install build time dependecies
+RUN pacman --needed --noconfirm -Syq base-devel && yes | pacman -Sccq
+
+# Set at build time, forces Docker's layer caching to reset at this point
+ARG VCS_REF=0
+
+COPY ./ /src
+WORKDIR /src
+
+RUN git clean -dxf ||:
+RUN git fetch --unshallow ||:
+RUN git fetch --tags ||:
+
+RUN ./bootstrap.sh
+RUN ./configure
+RUN make
+RUN make install DESTDIR=/pkgdir
+
+FROM fontship-base AS fontship
+
+LABEL maintainer="Caleb Maclennan <[email protected]>"
+LABEL version="$VCS_REF"
+
+COPY build-aux/docker-entrypoint.sh /usr/local/bin
+
+COPY --from=fontship-builder /pkgdir /
+
+WORKDIR /data
+ENTRYPOINT ["docker-entrypoint.sh"]

Makefile.am

@@ -6,3 +6,7 @@ license_DATA = LICENSE
 licensedir = $(datadir)/licenses/fontship
 
 CLEANFILES = $(bin_SCRIPTS)
+
+.PHONY: docker
+docker: Dockerfile build-aux/docker-entrypoint.sh
+	docker build --tag theleagueof/fontship:HEAD ./

README.md

@@ -7,11 +7,12 @@ League of Moveable Type](https://www.theleagueofmoveabletype.com/).
 
 ## Setup & Usage
 
-Fontship can be used in any of three different ways:
+Fontship can be used in any of four different ways:
 
-1.  Directly on a local system that has all the required dependencies.
+1.  Directly on a local system that has all the required dependencies and fontship has been installed.
 2.  On a local system via a Docker image for low hastle setup.
 3.  Remotely via a CI runner.
+4.  By including fontship into your project's Makefile.
 
 ### Local Setup
 
@@ -33,9 +34,18 @@ run `./bootstrap.sh` or download and extract a tarball, then run:
 
 ### Docker Setup
 
+Docker images are available from Docker Hub or you can build them yourself.
+
 Add an alias:
 
-    $ alias fontship='docker run -it --volume "$(pwd):/data" --user "$(id -u):$(id -g)" theleagueof/fontship:master"
+    $ alias fontship='docker run -it --volume "$(pwd):/data" --user "$(id -u):$(id -g)" theleagueof/fontship:latest fontship"
+
+You may substitute *latest*, which will always be the most recently released tagged version, with *master* to use the latest unreleased build, with a tag name to explicitly use a specific version, or with *HEAD* to use an image build locally.
+
+To build a docker image locally, you'll want to clone this repository and run `./bootstrap.sh` or download and extract a tarball, then run:
+
+    $ ./configure
+    $ make docker
 
 ### CI Setup
 
@@ -56,3 +66,13 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 ```
+
+### Makefile Setup
+
+If ⓐ your system has all the dependencies and ⓑ your project already has a `Makefile`, you can extend your existing makefile with fontship's targets my including it:
+
+```makefile
+include path/to/fontship/src/Makefile
+```
+
+This may reference a path to fontship as a git submodule (useful for locking the fontship version to your project's build), or just a relative path to somewhere you have the fontship source.

build-aux/docker-entrypoint.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- fontship "$@"
+fi
+
+exec "$@"

fontship.in

@@ -2,6 +2,9 @@
 
 VERSION = "@VERSION@"
 
+import sys
+sys.path.append("@pythondir@/".replace("${prefix}", "@prefix@"))
+
 import fontship
 
 # vim: ft=python