소스 검색

Merge pull request #9 from linuxserver/imagick_repo

switch to repo pinning style to add packages, use repo imagick
j0nnymoe 7 년 전
부모
커밋
0424fd4ea7
2개의 변경된 파일10개의 추가작업 그리고 6개의 파일을 삭제
  1. 9 6
      Dockerfile
  2. 1 0
      README.md

+ 9 - 6
Dockerfile

@@ -6,17 +6,20 @@ ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 
-# install packages
+# add repositories
 RUN \
+ echo "@edge http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \
+ echo "@community http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
+
+# install packages
  apk add --no-cache \
-	imagemagick \
 	ffmpeg && \
  apk add --no-cache \
-	--repository http://nl.alpinelinux.org/alpine/edge/main \
-	libwebp && \
+	imagemagick@edge \
+	libwebp@edge && \
  apk add --no-cache \
-	--repository http://nl.alpinelinux.org/alpine/edge/community \
-	php7-gd && \
+	php7-gd@community \
+	php7-imagick@community && \
 
 # configure php
 echo "[www]" >> /etc/php7/php-fpm.conf && \

+ 1 - 0
README.md

@@ -82,6 +82,7 @@ On first run create an admin account, any folder and its subfolders that you map
 
 ## Versions
 
++ **03.05.17:** Use repo pinning to better solve dependencies, use repo version of php7-imagick.
 + **14.02.17:** Rebase to alpine 3.5.
 + **14.10.16:** Add version layer information.
 + **30.09.16:** Rebase to alpine linux.