install imagemagick right after JPEG dev

C2DH · Nov 28, 2024 · 913be23 · 913be23
1 parent d31d44c
commit 913be23
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,6 @@ RUN apk add --no-cache git
 
 RUN apk add --no-cache \
     postgresql-libs
-RUN apk add imagemagick-dev imagemagick
 # RUN apk add imagemagick6-dev -U --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
 RUN apk add --no-cache --virtual .build-deps \
     gcc \
@@ -29,6 +28,8 @@ RUN apk add --no-cache --virtual .build-deps \
     fribidi-dev \
     libxslt-dev
 
+RUN apk add imagemagick-dev imagemagick
+RUN magick -list format
 RUN apk add yaml-dev
 
 COPY miller ./miller

diff --git a/Makefile b/Makefile
@@ -3,10 +3,12 @@ ENV ?= development
 
 build:
 	docker build \
+		--no-cache \
+		--progress=plain \
 		-t c2dhunilu/miller-v2:${BUILD_TAG} \
 		--build-arg GIT_TAG=$(shell git describe --tags) \
 		--build-arg GIT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD) \
-		--build-arg GIT_REVISION=$(shell git rev-parse --short HEAD) .
+		--build-arg GIT_REVISION=$(shell git rev-parse --short HEAD) . &> build.log
 
 run-latest:
 	cd docker && docker-compose -f docker-compose.yml up --build