chore(docker): Update container build issues after other refactoring

Dockerfile

@@ -64,8 +64,7 @@ RUN make
 RUN make check-version
 RUN make install DESTDIR=/pkgdir
 
-# Work around BuiltKit / buildx bug, they can’t copy to symlinks only dirs
-RUN mv /pkgdir/usr/local/{share/,}/man
+FROM base AS final
 
 # Same args as above, repeated because they went out of scope with FROM
 ARG REVISION
@@ -107,4 +106,4 @@ COPY --from=builder /src/lib/fontship-entry.zsh /usr/local/bin
 RUN fontship --version
 
 WORKDIR /data
-ENTRYPOINT ["fontship-entry.zsh"]
+ENTRYPOINT [ "fontship-entry.zsh" ]

hooks/build

@@ -3,7 +3,7 @@ set -e
 
 : "${ARCHTAG:=latest}"
 
-DESC=$(git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g')
+REVISION=$(git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g')
 
 RUNTIME_DEPS='diffutils entr font-v gftools git libarchive libgit2 make'\
 ' psautohint python python-babelfont python-brotli python-cffsubr'\
@@ -18,7 +18,8 @@ export DOCKER_BUILDKIT
 
 docker build \
 	--build-arg ARCHTAG="$ARCHTAG" \
-	--build-arg VCS_REF="${1:-$DESC}" \
+	--build-arg REVISION="$REVISION" \
+	--build-arg VERSION="${1:-$REVISION}" \
 	--build-arg RUNTIME_DEPS="$RUNTIME_DEPS" \
 	--build-arg BUILD_DEPS="$BUILD_DEPS" \
 	--tag $DOCKER_REPO:$DOCKER_TAG \