Merge branch 'master' into pull-127-conflict-resolve

beanstalkd-console/install.sh

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # exit if a command fails
-set -e
+set -eo pipefail
 
 # download
 curl -sL https://github.com/ptrofimov/beanstalk_console/archive/master.tar.gz | tar xvz -C /tmp

beanstalkd/install.sh

@@ -1,9 +1,9 @@
 #! /bin/bash
 
 # exit if a command fails
-set -e
+set -eo pipefail
 
-version="1.10"
+version="1.11"
 
 # install curl (needed to install rust)
 apt-get update && apt-get install -y curl build-essential

hugin/install.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # exit if a command fails
-set -e
+set -eo pipefail
 
 # install hugin & panotools
 apt-get update && apt-get install -y hugin

jekyll/install.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # exit if a command fails
-set -e
+set -eo pipefail
 
 # install ruby 1.9.1
 apt-get update && apt-get install -y ruby ruby-dev build-essential

latex/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:wheezy
+FROM debian:buster
 LABEL maintainer="Johannes Schickling <schickling.j@gmail.com>"
 
 ENV DEBIAN_FRONTEND noninteractive

latex/install.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # exit if a command fails
-set -e
+set -eo pipefail
 
 # install full texlive distribution
 apt-get update && apt-get install -y texlive-full

mailcatcher/Dockerfile

@@ -9,13 +9,15 @@ RUN set -xe \
     && apk add --no-cache --virtual .build-deps \
         build-base \
         sqlite-dev \
-    && gem install mailcatcher -v 0.6.5 --no-ri --no-rdoc \
+    && gem install mailcatcher -v 0.8.0 --no-ri --no-rdoc \
     && apk del .build-deps
 
+ENV HTTPPATH="/"
+
 # smtp port
 EXPOSE 1025
 
 # webserver port
 EXPOSE 1080
 
-CMD ["mailcatcher", "--no-quit", "--foreground", "--ip=0.0.0.0"]
+CMD ["sh", "-c", "mailcatcher --no-quit --foreground --ip=0.0.0.0 --http-path $HTTPPATH"]

mailcatcher/README.md

@@ -9,3 +9,10 @@ $ docker run -d -p 1080:1080 --name mailcatcher schickling/mailcatcher
 ```
 
 Link the container to another container and use the mailcatcher SMTP port `1025` via a ENV variable like `$MAILCATCHER_PORT_1025_TCP_ADDR`.
+
+## HTTP Path Support
+You can run the web interface under a different root by specifying the environmental variable HTTPPATH. This can be used if you're proxying the incoming connection. 
+
+```sh
+$ docker run -d -p 1080:1080 -e HTTPPATH="mailcatcher" --name mailcatcher schickling/mailcatcher
+```

mysql-backup-s3/backup.sh

@@ -1,6 +1,6 @@
-#! /bin/sh
+#!/bin/sh
 
-set -e
+set -eo pipefail
 
 if [ "${S3_ACCESS_KEY_ID}" == "**None**" ]; then
   echo "Warning: You did not set the S3_ACCESS_KEY_ID environment variable."

mysql-backup-s3/install.sh

@@ -1,8 +1,7 @@
-#! /bin/sh
+#!/bin/sh
 
 # exit if a command fails
-set -e
-
+set -eo pipefail
 
 apk update
 
@@ -10,16 +9,8 @@ apk update
 apk add mysql-client
 
 # install s3 tools
-apk add python py-pip
+apk add python3 py3-pip
 pip install awscli
-apk del py-pip
-
-# install go-cron
-apk add curl
-curl -L --insecure https://github.com/odise/go-cron/releases/download/v0.0.6/go-cron-linux.gz | zcat > /usr/local/bin/go-cron
-chmod u+x /usr/local/bin/go-cron
-apk del curl
-
 
 # cleanup
 rm -rf /var/cache/apk/*

mysql-backup-s3/run.sh

@@ -1,6 +1,6 @@
-#! /bin/sh
+#!/bin/sh
 
-set -e
+set -eo pipefail
 
 if [ "${S3_S3V4}" = "yes" ]; then
     aws configure set default.s3.signature_version s3v4
@@ -9,5 +9,6 @@ fi
 if [ "${SCHEDULE}" = "**None**" ]; then
   sh backup.sh
 else
-  exec go-cron "$SCHEDULE" /bin/sh backup.sh
+  echo "$SCHEDULE /bin/sh /backup.sh" > /etc/crontabs/root
+  exec crond -d 8 -f
 fi

nodejs/install.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # exit if a command fails
-set -e
+set -eo pipefail
 
 # install node & npm
 apt-get update && apt-get install -y nodejs npm

octave/install.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # exit if a command fails
-set -e
+set -eo pipefail
 
 # install octave 3.6.2 (less needed as frontend)
 apt-get update && apt-get install -y octave less

postgres-backup-s3/README.md

@@ -31,8 +31,8 @@ pgbackups3:
     S3_BUCKET: my-bucket
     S3_PREFIX: backup
     POSTGRES_BACKUP_ALL: "false"
-    POSTGRES_HOST: postgres
-    POSTGRES_DATABASE: dbname,dbname1,dbname2
+    POSTGRES_HOST: host
+    POSTGRES_DATABASE: dbname
     POSTGRES_USER: user
     POSTGRES_PASSWORD: password
     POSTGRES_EXTRA_OPTS: '--schema=public --blobs'

postgres-backup-s3/backup.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-set -e
+set -eo pipefail
 set -o pipefail
 
 if [ "${S3_ACCESS_KEY_ID}" = "**None**" ]; then

postgres-backup-s3/install.sh

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # exit if a command fails
-set -e
+set -eo pipefail
 
 
 apk update

postgres-backup-s3/run.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-set -e
+set -eo pipefail
 
 if [ "${S3_S3V4}" = "yes" ]; then
     aws configure set default.s3.signature_version s3v4

postgres-restore-s3/install.sh

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # exit if a command fails
-set -e
+set -eo pipefail
 
 apk update
 

postgres-restore-s3/restore.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-set -e
+set -eo pipefail
 set -o pipefail
 
 if [ "${S3_ACCESS_KEY_ID}" = "**None**" ]; then

redis-commander/install.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # exit if a command fails
-set -e
+set -eo pipefail
 
 # install node & npm
 apt-get update && apt-get install -y nodejs npm

rust/install.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # exit if a command fails
-set -e
+set -eo pipefail
 
 # install curl (needed to install rust)
 apt-get update && apt-get install -y curl gdb g++-multilib lib32stdc++6 libssl-dev libncurses5-dev

s3cmd/install.sh

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # exit if a command fails
-set -e
+set -eo pipefail
 
 # install s3cmd
 apk update

s3cmd/run.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-set -e
+set -eo pipefail
 
 echo "Running s3cmd ..."
 

scala-sbt-docker/install.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # exit if a command fails
-set -e
+set -eo pipefail
 
 # install node & npm
 apt-get update && apt-get install -y nodejs npm

swagger-ui/run.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-set -e
+set -eo pipefail
 
 replace_in_index () {
   if [ "$1" != "**None**" ]; then