From 46756d636abcee328cd35d4a352af2376c65c42a Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Fri, 12 Aug 2022 17:55:29 -0500 Subject: [PATCH] refactor: switch to hosted docker container --- Dockerfile | 7 ------- Makefile | 11 +++-------- 2 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 8ed10fb..0000000 --- a/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM alpine:3.16.2 - -RUN apk add --no-cache inkscape - -WORKDIR /data - -ENTRYPOINT ["inkscape"] diff --git a/Makefile b/Makefile index ae71b93..afb6ea0 100644 --- a/Makefile +++ b/Makefile @@ -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/') ifneq ($(DOCKER),true) - INKSCAPE := inkscape + CONVERT := convert else - INKSCAPE := docker run --rm -v "$$(pwd)":/data daylinmorgan/inkscape + CONVERT := docker run --rm -v "$$(pwd)":/imgs dpokidov/imagemagick endif @@ -23,7 +23,7 @@ all: pngs: $(PNGS) ./docs/png/%.png: ./docs/svg/%.svg - $(INKSCAPE) --export-filename=$@ $< + $(CONVERT) $(if DOCKER=true,/imgs/)$< $(if DOCKER=true,/imgs/)$@ .PHONY: logos ## generate all of the logo svgs @@ -49,11 +49,6 @@ pdm-env: conda-env pip install pdm; \ pdm install -.PHONY: docker.build -## build the docker container for inkscape -docker.build: - docker build . -t daylinmorgan/inkscape - .PHONY: clean ## remove old files clean: