Create directory for pidfile (usually created by init script)

These are in the Prosody debian package dependencies.

Dockerfile

@@ -3,16 +3,22 @@
 # Based on ubuntu
 ################################################################################
 
-FROM ubuntu:14.04
+FROM debian:9
 
-MAINTAINER Lloyd Watkin <lloyd@evilprofessor.co.uk>
+MAINTAINER Prosody Developers <developers@prosody.im>
+
+# Some dependencies in stretch are not suitable for Prosody 0.11.x, so add our repo
+RUN echo "deb http://packages.prosody.im/debian stretch main" > /etc/apt/sources.list.d/prosody.list
+ADD prosody_packages.gpg /etc/apt/trusted.gpg.d/prosody.gpg
 
 # Install dependencies
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        lsb-base \
+        adduser \
         libidn11 \
-        liblua5.1-expat0 \
-        libssl1.0.0 \
+        libssl1.1 \
+        lua-bitop \
         lua-dbi-mysql \
         lua-dbi-postgresql \
         lua-dbi-sqlite3 \
@@ -23,7 +29,10 @@ RUN apt-get update \
         lua-socket \
         lua-zlib \
         lua5.1 \
+        lua5.2 \
         openssl \
+        ca-certificates \
+        ssl-cert \
     && rm -rf /var/lib/apt/lists/*
 
 # Install and configure prosody
@@ -32,8 +41,13 @@ RUN dpkg -i /tmp/prosody.deb \
     && sed -i '1s/^/daemonize = false;\n/' /etc/prosody/prosody.cfg.lua \
     && perl -i -pe 'BEGIN{undef $/;} s/^log = {.*?^}$/log = {\n    {levels = {min = "info"}, to = "console"};\n}/smg' /etc/prosody/prosody.cfg.lua
 
+RUN mkdir -p /var/run/prosody && chown prosody:prosody /var/run/prosody
+
 COPY ./entrypoint.sh /entrypoint.sh
+RUN chmod 755 /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 
 EXPOSE 80 443 5222 5269 5347 5280 5281
-CMD ["prosodyctl", "start"]
+USER prosody
+ENV __FLUSH_LOG yes
+CMD ["prosody"]

README.md

@@ -1,14 +1,22 @@
-# Prosody Docker
+# Docker build scripts for Prosody build server
 
-This is the Prosody Docker image building repository. Its only really designed to be used on the Prosody build server for pushing to the [Docker registry](https://registry.hub.docker.com).
+This is the Prosody Docker image building repository. It is used by our build server to build and publish Docker images for stable releases and nightly builds.
 
-For images please see here: [Prosody on Docker](https://registry.hub.docker.com/u/prosody/prosody/).
+**Note:** Using this Dockerfile outside of our build server is not a supported use-case. There are many
+alternative Dockerfiles for Prosody available which can be used for this:
 
-It works by coping in a recently built `deb` file and running the install on the system.
+  - [OpusVL/prosody-docker](https://github.com/OpusVL/prosody-docker/)
+  - [unclev/prosody-docker-extended](https://github.com/unclev/prosody-docker-extended)
+
+## Published images
+
+For images please see here: [Prosody on Docker](https://hub.docker.com/r/prosody/prosody/).
 
 ## Running
 
-Docker images are built off an __Ubuntu 14.04 LTS__ base.
+It works by copying in a recently built `deb` file and running the install on the system.
+
+Docker images are built off an __Debian 9 (stretch)__ base.
 
 ```bash
 docker run -d --name prosody -p 5222:5222 prosody/prosody

build-docker.sh

@@ -1,4 +1,4 @@
-# /bin/bash
+#!/bin/bash
 
 if [[ -z "$1" ]]; then
     echo "Usage: ./build-docker.sh def_file_name version_number"
@@ -11,18 +11,18 @@ if [[ -z "$2" ]]; then
 fi
 
 echo "Starting build..."
-cp $1 ./prosody.deb
-docker build -t prosody/prosody:$2 .
+cp "$1" ./prosody.deb
+docker build -t prosody/prosody:"$2" .
 for i in "${@:3}"; do
   echo "Also building tag $i"
-  docker build -t prosody/prosody:$i .
+  docker build -t prosody/prosody:"$i" .
 done
 docker push prosody/prosody
 
 echo "Cleaning up..."
-docker rmi prosody/prosody:$2
+docker rmi prosody/prosody:"$2"
 for i in "${@:3}"; do
   echo "Also cleaning tag $i"  
-  docker rmi prosody/prosody:$i
+  docker rmi prosody/prosody:"$i"
 done
 rm ./prosody.deb

entrypoint.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 set -e
 
+if [[ "$1" != "prosody" ]]; then
+    exec prosodyctl $*
+    exit 0;
+fi
+
 if [ "$LOCAL" -a  "$PASSWORD" -a "$DOMAIN" ] ; then
     prosodyctl register $LOCAL $DOMAIN $PASSWORD
 fi