diff --git a/jenkins/docker-compose.yml b/jenkins/docker-compose.yml index 00d6479..f4c2861 100644 --- a/jenkins/docker-compose.yml +++ b/jenkins/docker-compose.yml @@ -1,5 +1,5 @@ jenkins: - image: jenkinsci/jenkins + image: jenkins:alpine ports: - "8080:8080" - "50000:50000" diff --git a/minidlna/Dockerfile b/minidlna/Dockerfile index fbb710c..f2aa559 100644 --- a/minidlna/Dockerfile +++ b/minidlna/Dockerfile @@ -5,9 +5,7 @@ FROM alpine MAINTAINER kev -RUN set -xe \ - && apk add -U minidlna \ - && rm -rf /var/cache/apk/* +RUN apk add --no-cache minidlna VOLUME /opt WORKDIR /opt diff --git a/minidlna/arm/Dockerfile b/minidlna/arm/Dockerfile index 7e09b78..23b20bf 100644 --- a/minidlna/arm/Dockerfile +++ b/minidlna/arm/Dockerfile @@ -5,9 +5,7 @@ FROM easypi/alpine-arm MAINTAINER EasyPi Software Foundation -RUN set -xe \ - && apk add -U minidlna \ - && rm -rf /var/cache/apk/* +RUN apk add --no-cache minidlna VOLUME /opt WORKDIR /opt @@ -15,4 +13,4 @@ WORKDIR /opt EXPOSE 1900/udp EXPOSE 8200/tcp -CMD ["minidlna", "-d"] +CMD ["minidlnad", "-d"] diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile index 550a7c5..3a80c23 100644 --- a/zoneminder/Dockerfile +++ b/zoneminder/Dockerfile @@ -19,7 +19,8 @@ RUN set -xe \ && chmod o+r /etc/zm/zm.conf \ && sed -i 's@^ZM_DB_HOST=.*$@ZM_DB_HOST=mysql@' /etc/zm/zm.conf \ && sed -i 's@^;date.timezone =.*$@date.timezone = Asia/Shanghai@' /etc/php5/*/php.ini \ - && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ + && echo 'FCGI_CHILDREN=4' > /etc/default/fcgiwrap COPY nginx.conf /etc/nginx/sites-available/default