Merge pull request #3 from sparklyballs/alpine

Davos rebased to Alpine

Dockerfile

@@ -1,21 +1,26 @@
-FROM linuxserver/baseimage
+FROM lsiobase/alpine
 MAINTAINER Josh Stark <jagfin1@gmail.com>
 
-ENV APTLIST="oracle-java8-set-default oracle-java8-installer"
+# package version
+ARG DAVOS_VER="latest"
 
+# install packages
+RUN \
+ apk add --no-cache \
+	curl \
+	openjdk8-jre
 
-RUN add-apt-repository ppa:webupd8team/java && \
-apt-get update -q && \
-echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
-apt-get install $APTLIST -qy && \
-apt-get clean && rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/* && \
-mkdir /download
+# install davos
+RUN \
+ mkdir -p \
+	/app/davos && \
+ curl -o \
+ /app/davos/davos.jar -L \
+	http://files.linuxserver.io/davos/davos-${DAVOS_VER}.jar
 
-#Adding Custom files
-ADD init/ /etc/my_init.d/
-ADD services/ /etc/service/
-RUN chmod -v +x /etc/service/*/run /etc/my_init.d/*.sh
+# add local files
+COPY root/ /
 
-# Volumes and Ports
-VOLUME /config /download
+# ports and volumes
 EXPOSE 8080
+VOLUME /config /download

READMETEMPLATE.md

@@ -1,45 +0,0 @@
-![http://linuxserver.io](http://www.linuxserver.io/wp-content/uploads/2015/06/linuxserver_medium.png)
-
-The [LinuxServer.io](https://www.linuxserver.io/) team brings you another quality container release featuring auto-update on startup, easy user mapping and community support. Be sure to checkout our [forums](https://forum.linuxserver.io/index.php) or for real-time support our [IRC](https://www.linuxserver.io/index.php/irc/) on freenode at `#linuxserver.io`.
-
-# linuxserver/<container-name>
-
-<Provide a short, concise description of the application. No more than two SHORT paragraphs. Link to sources where possible and include an image illustrating your point if necessary. Point users to the original applications website, as that's the best place to get support - not here.>
-
-## Usage
-
-```
-docker create --name=<container-name> -v /etc/localtime:/etc/localtime:ro -v <path to data>:/config -e PGID=<gid> -e PUID=<uid>  -p 1234:1234 linuxserver/<container-name>
-```
-
-**Parameters**
-
-* `-p 4242` - the port(s)
-* `-v /etc/localtime` for timesync - *optional*
-* `-v /config` -
-* `-e PGID` for GroupID - see below for explanation
-* `-e PUID` for UserID - see below for explanation
-
-It is based on phusion-baseimage with ssh removed, for shell access whilst the container is running do `docker exec -it <container-name> /bin/bash`.
-
-### User / Group Identifiers
-
-**TL;DR** - The `PGID` and `PUID` values set the user / group you'd like your container to 'run as' to the host OS. This can be a user you've created or even root (not recommended).
-
-Part of what makes our containers work so well is by allowing you to specify your own `PUID` and `PGID`. This avoids nasty permissions errors with relation to data volumes (`-v` flags). When an application is installed on the host OS it is normally added to the common group called users, Docker apps due to the nature of the technology can't be added to this group. So we added this feature to let you easily choose when running your containers.
-
-## Setting up the application 
-
-<Insert a basic user guide here to get a n00b up and running with the software inside the container.> DELETE ME
-
-
-## Updates
-
-* Upgrade to the latest version simply `docker restart <container-name>`.
-* To monitor the logs of the container in realtime `docker logs -f <container-name>`.
-
-
-
-## Versions
-
-+ **dd.MM.yyyy:** This is the standard Version type now. 

init/30_install_davos.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-curl -o /app/davos.jar https://ci.linuxserver.io/job/davos/job/davos_03_Release/ws/build/libs/davos-1.0.jar
-
-chown abc:abc /app/davos.jar

root/etc/cont-init.d/30-config

@@ -0,0 +1,8 @@
+#!/usr/bin/with-contenv bash
+
+# permissions
+chown -R abc:abc \
+	/app \
+	/config
+chown abc:abc \
+	/download

root/etc/services.d/davos/run

@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+exec \
+	s6-setuidgid abc /usr/bin/java -jar /app/davos/davos.jar

services/davos/run

@@ -1,2 +0,0 @@
-#!/bin/bash
-exec /sbin/setuser abc java -jar /app/davos.jar