Add new images

tx-apache/Dockerfile

-FROM tx-debian
+FROM pica-debian
 MAINTAINER antoinebarbare@gmail.com
 
 # Install base packages

tx-dokuwiki/nginx.conf

@@ -35,12 +35,12 @@ http {
             try_files $uri $uri/ @dokuwiki;
         }
 
-        location @dokuwiki {
-            rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last;
-            rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last;
-            rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last;
-            rewrite ^/(.*) /doku.php?id=$1 last;
-        }
+        #location @dokuwiki {
+        #    rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last;
+        #    rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last;
+        #    rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last;
+        #    rewrite ^/(.*) /doku.php?id=$1 last;
+        #}
 
         location ~ \.php$ {
             try_files $uri =404;

tx-etherpad/Dockerfile

-FROM tx-debian:latest
+FROM pica-debian:latest
 MAINTAINER antoine@barbare.me
 
 ENV ETHERPAD_VERSION 1.6.0

tx-etherpad/add/entrypoint.sh

@@ -2,9 +2,7 @@
 set -e
 
 if [ -z "$MYSQL_PORT_3306_TCP_ADDR" ]; then
-	echo >&2 'error: missing MYSQL_PORT_3306_TCP environment variable'
-	echo >&2 '  Did you forget to --link some_mysql_container:mysql ?'
-	exit 1
+	: ${MYSQL_PORT_3306_TCP_ADDR:=mysql}
 fi
 
 # if we're linked to MySQL, and we're using the root user, and our linked
@@ -32,14 +30,14 @@ fi
 
 # Check if database already exists
 RESULT=`mysql -u${ETHERPAD_DB_USER} -p${ETHERPAD_DB_PASSWORD} \
-	-hmysql --skip-column-names \
+	-h${MYSQL_PORT_3306_TCP_ADDR} --skip-column-names \
 	-e "SHOW DATABASES LIKE '${ETHERPAD_DB_NAME}'"`
 
 if [ "$RESULT" != $ETHERPAD_DB_NAME ]; then
 	# mysql database does not exist, create it
 	echo "Creating database ${ETHERPAD_DB_NAME}"
 
-	mysql -u${ETHERPAD_DB_USER} -p${ETHERPAD_DB_PASSWORD} -hmysql \
+	mysql -u${ETHERPAD_DB_USER} -p${ETHERPAD_DB_PASSWORD} -h${MYSQL_PORT_3306_TCP_ADDR} \
 	      -e "create database ${ETHERPAD_DB_NAME}"
 fi
 
@@ -54,7 +52,7 @@ if [ ! -f settings.json ]; then
 	  "dbType" : "mysql",
 	  "dbSettings" : {
 			    "user"    : "${ETHERPAD_DB_USER}",
-			    "host"    : "mysql",
+			    "host"    : "${MYSQL_PORT_3306_TCP_ADDR}",
 			    "password": "${ETHERPAD_DB_PASSWORD}",
 			    "database": "${ETHERPAD_DB_NAME}"
 			  },

tx-kanboard/Dockerfile

-FROM tx-apache
+FROM pica-apache
 MAINTAINER antoinebarbare@gmail.com
 
 # Install base packages

tx-mattermost/Dockerrun.aws.json

+{
+    "AWSEBDockerrunVersion": "2",
+    "volumes": [
+        {
+            "name": "app-config",
+            "host": {
+                "sourcePath": "/var/app/current/app/mattermost/config"
+            }
+        },
+        {
+            "name": "app-data",
+            "host": {
+                "sourcePath": "/var/app/current/app/mattermost/data"
+            }
+        },
+        {
+            "name": "db-data",
+            "host": {
+                "sourcePath": "/var/app/current/db/mattermost/var/lib/postgresql/data"
+            }
+        }
+    ],
+    "containerDefinitions": [
+        {
+            "name": "app",
+            "image": "mattermost/mattermost-prod-app:latest",
+            "memory": 128,
+            "mountPoints": [
+                {
+                    "sourceVolume": "app-config",
+                    "containerPath": "/mattermost/config"
+                },
+                {
+                    "sourceVolume": "app-data",
+                    "containerPath": "/mattermost/data"
+                }
+            ],
+            "portMappings": [
+                {
+                    "hostPort": 80,
+                    "containerPort": 80
+                }
+            ],
+            "links": [
+                "db"
+            ]
+        },
+        {
+            "name": "db",
+            "image": "mattermost/mattermost-prod-db:latest",
+            "memory": 128,
+            "mountPoints": [
+                {
+                    "sourceVolume": "db-data",
+                    "containerPath": "/var/lib/postgresql/data"
+                }
+            ]
+        }
+    ]
+}