build-docker.sh: Some small improvements for parameter handling

Dockerfile: chmod 755 the entrypoint, so we don't depend on the permissions of the build system, fixes #27
Merge pull request #28 from prosody/27-entrypoint.sh
2016-03-11 17:37:41 +00:00 · 2016-03-11 15:51:35 +00:00 · 2016-03-09 11:13:37 +00:00 · 2016-03-09 08:52:23 +00:00 · 2016-02-04 19:24:01 +00:00 · 2016-02-04 19:19:17 +00:00
3 changed files with 16 additions and 7 deletions
@@ -13,6 +13,7 @@ RUN apt-get update \
        libidn11 \
        liblua5.1-expat0 \
        libssl1.0.0 \
+        lua-bitop \
        lua-dbi-mysql \
        lua-dbi-postgresql \
        lua-dbi-sqlite3 \
@@ -33,7 +34,10 @@ RUN dpkg -i /tmp/prosody.deb \
    && perl -i -pe 'BEGIN{undef $/;} s/^log = {.*?^}$/log = {\n    {levels = {min = "info"}, to = "console"};\n}/smg' /etc/prosody/prosody.cfg.lua

 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"]
@@ -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
@@ -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
Author	SHA1	Message	Date
Matthew Wild	b98fdd49f4	build-docker.sh: Some small improvements for parameter handling	2016-03-11 17:37:41 +00:00
Matthew Wild	c095ddd323	Dockerfile: chmod 755 the entrypoint, so we don't depend on the permissions of the build system, fixes #27	2016-03-11 15:51:35 +00:00
Matthew Wild	6d139045cf	Merge pull request #28 from prosody/27-entrypoint.sh Make `entrypoint.sh` executable	2016-03-09 11:13:37 +00:00
Lloyd Watkin	b31d7c913e	Make `entrypoint.sh` executable Fixes #27 cc @mwild1	2016-03-09 08:52:23 +00:00
Matthew Wild	d346e0912e	Install lua-bitop, fixes #24	2016-02-04 19:24:01 +00:00
Matthew Wild	8bbb02e228	entrypoint.sh: If a command is passed to the image, run prosodyctl instead	2016-02-04 19:19:17 +00:00
Matthew Wild	bed0d8e598	Run as user 'prosody', and run prosody instead of prosodyctl. Also set __FLUSH_LOG environment variable to tell Prosody it needs to flush its logs after writing. Fixes #23 and fixes #25 .	2016-02-04 19:17:11 +00:00