From 7fdd8cf9415d054d942ac035be05d2b003d73308 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Mon, 3 Apr 2017 10:13:18 +0100 Subject: [PATCH 1/3] add composer packages and dependencies, use git api to get latest version, make one layer --- Dockerfile | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 11af9cf..952dc04 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,11 +6,13 @@ ARG BUILD_DATE ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -# set package version -ENV COPS_VER="1.1.0" +# install build packages +RUN \ + apk add --no-cache --virtual=build-dependencies \ + curl \ + tar && \ # install runtime packages -RUN \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/main \ icu-libs \ @@ -23,14 +25,22 @@ RUN \ php7-mbstring \ php7-opcache \ php7-openssl \ + php7-phar \ php7-pdo_sqlite \ - php7-zlib + php7-zip \ + php7-zlib && \ + +# install composer + ln -sf /usr/bin/php7 /usr/bin/php && \ + curl \ + -sS https://getcomposer.org/installer \ + | php -- --install-dir=/usr/bin --filename=composer && \ + composer \ + global require "fxp/composer-asset-plugin:~1.1" && \ # install cops -RUN \ - apk add --no-cache --virtual=build-dependencies \ - curl \ - tar && \ + COPS_VER=$(curl -sX GET "https://api.github.com/repos/seblucas/cops/releases/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]') && \ curl -o \ /tmp/cops.tar.gz -L \ "https://github.com/seblucas/cops/archive/${COPS_VER}.tar.gz" && \ @@ -38,6 +48,9 @@ RUN \ /usr/share/webapps/cops && \ tar xf /tmp/cops.tar.gz -C \ /usr/share/webapps/cops --strip-components=1 && \ + cd /usr/share/webapps/cops && \ + composer \ + install --no-dev --optimize-autoloader && \ # cleanup apk del --purge \ From 0c7510558b1e49c96ab2eb994861290719da71cb Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Mon, 3 Apr 2017 10:17:51 +0100 Subject: [PATCH 2/3] add composer cache to cleanup --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 952dc04..1a67c2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,6 +56,7 @@ RUN \ apk del --purge \ build-dependencies && \ rm -rf \ + /root/.composer \ /tmp/* # add local files From d4634b0ecf6034d7e85ec26f60fb7b9e899ede52 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Mon, 3 Apr 2017 10:21:13 +0100 Subject: [PATCH 3/3] readme update --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 042a367..2f6cc3c 100644 --- a/README.md +++ b/README.md @@ -110,6 +110,7 @@ Unlike other implementations of COPS in a docker container, the linuxserver ver ## Versions ++ **03.04.17:** Add composer packages, reduce layers. + **02.04.17:** Updated to version 1.1.0. + **05.02.17:** Updated to Alpine 3.5 & PHP7. + **24.10.16:** Updated to implement user based config.