refactor: switch to hosted docker container

This commit is contained in:
Daylin Morgan 2022-08-12 17:55:29 -05:00
parent d7550868fc
commit 46756d636a
2 changed files with 3 additions and 15 deletions

View file

@ -1,7 +0,0 @@
FROM alpine:3.16.2
RUN apk add --no-cache inkscape
WORKDIR /data
ENTRYPOINT ["inkscape"]

View file

@ -5,9 +5,9 @@ PNGS = $(patsubst ./docs/svg/%.svg,./docs/png/%.png, $(SVGS))
REV := $(shell date +'%Y.%m.%d-' )$(shell git describe --always --dirty | sed s'/dirty/dev/') REV := $(shell date +'%Y.%m.%d-' )$(shell git describe --always --dirty | sed s'/dirty/dev/')
ifneq ($(DOCKER),true) ifneq ($(DOCKER),true)
INKSCAPE := inkscape CONVERT := convert
else else
INKSCAPE := docker run --rm -v "$$(pwd)":/data daylinmorgan/inkscape CONVERT := docker run --rm -v "$$(pwd)":/imgs dpokidov/imagemagick
endif endif
@ -23,7 +23,7 @@ all:
pngs: $(PNGS) pngs: $(PNGS)
./docs/png/%.png: ./docs/svg/%.svg ./docs/png/%.png: ./docs/svg/%.svg
$(INKSCAPE) --export-filename=$@ $< $(CONVERT) $(if DOCKER=true,/imgs/)$< $(if DOCKER=true,/imgs/)$@
.PHONY: logos .PHONY: logos
## generate all of the logo svgs ## generate all of the logo svgs
@ -49,11 +49,6 @@ pdm-env: conda-env
pip install pdm; \ pip install pdm; \
pdm install pdm install
.PHONY: docker.build
## build the docker container for inkscape
docker.build:
docker build . -t daylinmorgan/inkscape
.PHONY: clean .PHONY: clean
## remove old files ## remove old files
clean: clean: