Commit df9eea14 authored by Yohei Shimmyo's avatar Yohei Shimmyo
Browse files

fix docker image

parent a059c20c
Loading
Loading
Loading
Loading
Loading
+14 −2
Changes for Dockerfile: 14 added lines, 2 removed lines.
Original line number Diff line number Diff line
FROM paperist/alpine-texlive-ja
RUN apk --no-cache update && apk --no-cache add make aspell aspell-en inkscape font-noto font-noto-cjk
FROM paperist/alpine-texlive-ja@sha256:8740b80015ff375df9ab904f9cda07a1f8db74ba216326eca8cddeb31e0d312e
RUN apk --no-cache update && apk --no-cache add make aspell aspell-en inkscape ghostscript

WORKDIR /fonts
RUN wget -q https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip \
    && unzip NotoSansCJKjp-hinted.zip \
    && wget -q https://noto-website-2.storage.googleapis.com/pkgs/NotoSerifCJKjp-hinted.zip \
    && unzip -o NotoSerifCJKjp-hinted.zip \
    && mkdir -p /usr/share/fonts/TTF \
    && mv *.otf /usr/share/fonts/TTF \
    && rm *.zip \
    && fc-cache -f

WORKDIR /workdir
+7 −3
Changes for Makefile: 7 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ LATEST_MOD_TIME := $(shell echo $(SRC) | xargs -n 1 date +%s -r | awk '{if(m<$$1
.PHONY:
run: build_paper

.PHONY: build_paper
build_paper: build_image
	docker run -ti --rm -v $(PWD):/workdir $(IMAGE_NAME) make -f docker.mk

.PHONY: build_image
build_image:
	if [ -z $(CREATION_TIME) ] || [ $(LATEST_MOD_TIME) -ge $(CREATION_TIME) ]; then \
@@ -15,6 +19,6 @@ build_image:
		echo "Docker container image is ready up to date."; \
	fi

.PHONY: build_paper
build_paper:
	docker run -ti --rm -v $(PWD):/workdir $(IMAGE_NAME) make -f docker.mk
.PHONY: clean
clean:
	make -f docker.mk clean