Bladeren bron

rebase to alpine linux

sparklyballs 8 jaren geleden
bovenliggende
commit
662c399d4d
7 gewijzigde bestanden met toevoegingen van 25 en 82 verwijderingen
  1. 21 33
      Dockerfile
  2. 4 5
      README.md
  3. 0 0
      root/defaults/default
  4. 0 0
      root/defaults/keyboard.js
  5. 0 0
      root/defaults/photoshow.fpm
  6. 0 7
      root/etc/cont-init.d/40-install
  7. 0 37
      sources.list

+ 21 - 33
Dockerfile

@@ -1,34 +1,22 @@
-# set base os
-FROM linuxserver/baseimage.nginx
-
-MAINTAINER Sparklyballs <sparklyballs@linuxserver.io>
-
-# copy sources.list
-COPY sources.list /etc/apt/
-
-# Set correct environment variables
-ENV APTLIST="ffmpeg git-core php5-gd"
-ENV LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
-
-# Set the locale
-RUN locale-gen en_US.UTF-8
-
-# update apt and install dependencies
-RUN add-apt-repository ppa:kirillshkrogalev/ffmpeg-next && \
-apt-get update && \
-apt-get install \
-$APTLIST -qy && \
-
-# clean up
-apt-get clean -y && \
-rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-#Adding Custom files
-ADD defaults/ /defaults/
-ADD init/ /etc/my_init.d/
-RUN chmod -v +x /etc/service/*/run /etc/my_init.d/*.sh && \
-mv defaults/photoshow.fpm /etc/php5/fpm/pool.d/photoshow.conf
-
-# set volumes and ports
+FROM lsiobase/alpine.nginx
+MAINTAINER Sparklyballs
+
+# install packages
+RUN \
+ apk add --no-cache \
+	ffmpeg \
+	php5-gd && \
+
+# configure php
+echo "[www]" >> /defaults/nginx-fpm.conf && \
+echo "php_admin_value[upload_max_filesize] = 10M" >> /defaults/nginx-fpm.conf && \
+echo "php_admin_value[post_max_size] = 10M" >> /defaults/nginx-fpm.conf && \
+echo "php_admin_value[memory_limit] = 64M" >> /defaults/nginx-fpm.conf && \
+echo "php_admin_value[max_execution_time] = 15" >> /defaults/nginx-fpm.conf
+
+# add local files
+COPY root/ /
+
+# ports and volumes
 EXPOSE 80
-VOLUME /config /Thumbs /Pictures 
+VOLUME /config /Thumbs /Pictures

+ 4 - 5
README.md

@@ -24,7 +24,6 @@ The [LinuxServer.io][linuxserverurl] team brings you another container release f
 ```
 docker create \
 --name=photoshow \
--v /etc/localtime:/etc/localtime:ro \
 -v <path to data>:/config \
 -v <path to pictures>:/Pictures:ro \
 -v <path to store thumbs>:/Thumbs \
@@ -37,7 +36,6 @@ linuxserver/photoshow
 **Parameters**
 
 * `-p 80` - port for the webui
-* `-v /etc/localtime` for timesync - *optional*
 * `-v /config` - stores config and logs for nginx base
 * `-v /Pictures` - your local folder of photos you wish to share
 * `-v /Thumbs` - local folder to store thumbnails of your images
@@ -45,7 +43,7 @@ linuxserver/photoshow
 * `-e PUID` for UserID - see below for explanation
 * `-e TZ` - for timezone information *eg Europe/London, etc*
 
-It is based on phusion-baseimage with ssh removed, for shell access whilst the container is running do `docker exec -it photoshow /bin/bash`.
+It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it photoshow /bin/bash`.
 
 ### User / Group Identifiers
 
@@ -63,13 +61,14 @@ In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as bel
 On first run create an admin account, any folder and its subfolders that you map to /Pictures will be presented as a webgallery. Config settings are persistent and stored as a subfolder of the /Thumbs mapping. 
 
 
-## Updates
+## Info
 
-* Upgrade to the latest version simply `docker restart photoshow`.
 * To monitor the logs of the container in realtime `docker logs -f photoshow`.
 
 
 ## Versions
+
++ **30.09.16:** Rebase to alpine linux. 
 + **11.09.16:** Add layer badges to README. 
 + **21.08.15:** Use patched keybaord js from fork of photoshow
 + **21.08.15:** Initial Release. 

+ 0 - 0
defaults/default → root/defaults/default


+ 0 - 0
defaults/keyboard.js → root/defaults/keyboard.js


+ 0 - 0
defaults/photoshow.fpm → root/defaults/photoshow.fpm


+ 0 - 7
init/60_update_get_the_site.sh → root/etc/cont-init.d/40-install

@@ -14,10 +14,3 @@ fi
 cp /defaults/keyboard.js /config/www//PhotoShow/src/js/keyboard.js
 sed -i -e "s@\$config->timezone.*@\$config->timezone = \"${TZ}\"@g" /config/www/PhotoShow/config.php
 chown -R abc:abc /config/www/PhotoShow /Thumbs
-
-# opt out for autoupdates
-[ "$ADVANCED_DISABLEUPDATES" ] && exit 0
-
-cd /config/www/PhotoShow
-git pull
-chown -R abc:abc /config/www/PhotoShow

+ 0 - 37
sources.list

@@ -1,37 +0,0 @@
-# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
-# newer versions of the distribution.
-
-deb http://archive.ubuntu.com/ubuntu/ trusty main restricted
-deb-src http://archive.ubuntu.com/ubuntu/ trusty main restricted
-
-## Major bug fix updates produced after the final release of the
-## distribution.
-deb http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted
-deb-src http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted
-
-## Uncomment the following two lines to add software from the 'universe'
-## repository.
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team. Also, please note that software in universe WILL NOT receive any
-## review or updates from the Ubuntu security team.
-deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ trusty universe multiverse
-deb http://archive.ubuntu.com/ubuntu/ trusty-updates universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ trusty-updates universe multiverse
-
-## N.B. software from this repository may not have been tested as
-## extensively as that contained in the main release, although it includes
-## newer versions of some applications which may provide useful features.
-## Also, please note that software in backports WILL NOT receive any review
-## or updates from the Ubuntu security team.
-# deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted
-# deb-src http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted
-
-deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted
-deb-src http://archive.ubuntu.com/ubuntu/ trusty-security main restricted
-deb http://archive.ubuntu.com/ubuntu/ trusty-security universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ trusty-security universe multiverse
-
-
-
-