Updating dockerfile for 0.6.0-rc1. Moving docker files into versioned directories.

14 files changed, 462 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index b8017c198..97de7eea5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@ _obj
 _test
 
 # Architecture specific extensions/prefixes
-*.[568vq]
 [568vq].out
 
 *.cgo1.go
diff --git a/Makefile b/Makefile
index 947e2d367..e7a5d9e72 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all test clean build install run stop cover dist cleandb travis
+.PHONY: all test clean build install run stop cover dist cleandb travis docker
 
 GOPATH ?= $(GOPATH:)
 GOFLAGS ?= $(GOFLAGS:)
@@ -24,6 +24,9 @@ DIST_RESULTS=$(DIST_ROOT)/results
 BENCH=.
 TESTS=.
 
+DOCKERNAME ?= mm-dev
+DOCKER_CONTAINER_NAME ?= mm-test
+
 all: travis
 
 travis:
@@ -193,6 +196,12 @@ stop:
 		kill $$PID; \
 	done
 
+	@if [ $(shell docker ps -a | grep -ci ${DOCKER_CONTAINER_NAME}) -eq 1 ]; then \
+		echo removing dev docker container; \
+		docker stop ${DOCKER_CONTAINER_NAME} > /dev/null; \
+		docker rm -v ${DOCKER_CONTAINER_NAME} > /dev/null; \
+	fi
+
 setup-mac:
 	echo $$(boot2docker ip 2> /dev/null) dockerhost | sudo tee -a /etc/hosts
 
@@ -243,3 +252,12 @@ dist: install
 	rm $(DIST_PATH)/web/templates/*.bak
 
 	tar -C dist -czf $(DIST_PATH).tar.gz mattermost
+
+docker-build: stop dist
+	cp $(DIST_PATH).tar.gz docker/dev
+	cd docker/dev && docker build -t ${DOCKERNAME} .
+	rm docker/dev/mattermost.tar.gz
+
+docker-run: docker-build
+	docker run --name ${DOCKER_CONTAINER_NAME} -d --publish 8065:80 ${DOCKERNAME}
+
diff --git a/Dockerfile b/docker/0.5/Dockerfile
index e6c04d541..fec69280e 100644
--- a/Dockerfile
+++ b/docker/0.5/Dockerfile
@@ -82,10 +82,11 @@ RUN wget http://download.redis.io/redis-stable.tar.gz; \
 # ---------------------------------------------------------------------------------------------------------------------
 
 # Copy over files
-ADD . /go/src/github.com/mattermost/platform
+ADD https://github.com/mattermost/platform/archive/v0.50.tar.gz /go/src/github.com/mattermost/
+RUN mkdir /go/src/github.com/mattermost/platform && tar -zxvf /go/src/github.com/mattermost/v0.50.tar.gz -C /go/src/github.com/mattermost/platform --strip-components=1
 
 # Insert postfix config
-ADD ./docker/main.cf /etc/postfix/
+ADD ./main.cf /etc/postfix/
 
 RUN go get github.com/tools/godep
 RUN cd /go/src/github.com/mattermost/platform; godep restore
@@ -95,8 +96,5 @@ RUN cd /go/src/github.com/mattermost/platform/web/react; npm install
 RUN chmod +x /go/src/github.com/mattermost/platform/docker/docker-entry.sh
 ENTRYPOINT /go/src/github.com/mattermost/platform/docker/docker-entry.sh
 
-# Create default storage directory
-RUN mkdir /mattermost/
-
 # Ports
 EXPOSE 80
diff --git a/docker/0.5/Dockerrun.aws.json b/docker/0.5/Dockerrun.aws.json
new file mode 100755
index 000000000..04c7f4224
--- /dev/null
+++ b/docker/0.5/Dockerrun.aws.json
@@ -0,0 +1,13 @@
+{

+  "AWSEBDockerrunVersion": "1",

+  "Image": {

+    "Name": "mattermost/platform:helium",

+    "Update": "true"

+  },

+  "Ports": [

+    {

+      "ContainerPort": "80"

+    }

+  ],

+  "Logging": "/var/log/"

+}

diff --git a/docker/docker-entry.sh b/docker/0.5/docker-entry.sh
index cfa589041..cfa589041 100755
--- a/docker/docker-entry.sh
+++ b/docker/0.5/docker-entry.sh
diff --git a/docker/main.cf b/docker/0.5/main.cf
index ed97d37ef..ed97d37ef 100644
--- a/docker/main.cf
+++ b/docker/0.5/main.cf
diff --git a/docker/0.6/Dockerfile b/docker/0.6/Dockerfile
new file mode 100644
index 000000000..ae3c9893c
--- /dev/null
+++ b/docker/0.6/Dockerfile
@@ -0,0 +1,51 @@
+# Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+# See License.txt for license information.
+FROM ubuntu:14.04
+
+#
+# Install SQL
+#
+
+ENV MYSQL_ROOT_PASSWORD=mostest
+ENV MYSQL_USER=mmuser
+ENV MYSQL_PASSWORD=mostest
+ENV MYSQL_DATABASE=mattermost_test
+
+RUN groupadd -r mysql && useradd -r -g mysql mysql
+
+RUN apt-get update && apt-get install -y perl --no-install-recommends && rm -rf /var/lib/apt/lists/*
+
+RUN apt-key adv --keyserver pool.sks-keyservers.net --recv-keys A4A9406876FCBD3C456770C88C718D3B5072E1F5
+
+ENV MYSQL_MAJOR 5.6
+ENV MYSQL_VERSION 5.6.25
+
+RUN echo "deb http://repo.mysql.com/apt/debian/ wheezy mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
+
+RUN apt-get update \
+	&& export DEBIAN_FRONTEND=noninteractive \
+	&& apt-get -y install mysql-server \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/lib/mysql && mkdir -p /var/lib/mysql
+
+RUN sed -Ei 's/^(bind-address|log)/#&/' /etc/mysql/my.cnf
+
+VOLUME /var/lib/mysql
+# ---------------------------------------------------------------------------------------------------------------------
+
+WORKDIR /mattermost
+
+# Copy over files
+ADD https://github.com/mattermost/platform/releases/download/v0.6.0-rc1/mattermost.tar.gz /
+RUN tar -zxvf /mattermost.tar.gz --strip-components=1
+ADD config_docker.json /
+ADD docker-entry.sh /
+
+RUN chmod +x /docker-entry.sh
+ENTRYPOINT /docker-entry.sh
+
+# Create default storage directory
+RUN mkdir /mattermost-data/
+
+# Ports
+EXPOSE 80
diff --git a/docker/0.6/Dockerrun.aws.json b/docker/0.6/Dockerrun.aws.json
new file mode 100755
index 000000000..c29678c85
--- /dev/null
+++ b/docker/0.6/Dockerrun.aws.json
@@ -0,0 +1,13 @@
+{

+  "AWSEBDockerrunVersion": "1",

+  "Image": {

+    "Name": "mattermost/platform:0.6.0",

+    "Update": "true"

+  },

+  "Ports": [

+    {

+      "ContainerPort": "80"

+    }

+  ],

+  "Logging": "/var/log/"

+}

diff --git a/config/config_docker.json b/docker/0.6/config_docker.json
index 6d220f919..6d220f919 100644
--- a/config/config_docker.json
+++ b/docker/0.6/config_docker.json
diff --git a/docker/0.6/docker-entry.sh b/docker/0.6/docker-entry.sh
new file mode 100755
index 000000000..ce9f91c40
--- /dev/null
+++ b/docker/0.6/docker-entry.sh
@@ -0,0 +1,111 @@
+#!/bin/bash
+# Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+# See License.txt for license information.
+
+mkdir -p web/static/js
+
+echo "127.0.0.1 dockerhost" >> /etc/hosts
+/etc/init.d/networking restart
+
+echo configuring mysql
+
+# SQL!!!
+set -e
+
+get_option () {
+	local section=$1
+	local option=$2
+	local default=$3
+	ret=$(my_print_defaults $section | grep '^--'${option}'=' | cut -d= -f2-)
+	[ -z $ret ] && ret=$default
+	echo $ret
+}
+
+
+# Get config
+DATADIR="$("mysqld" --verbose --help 2>/dev/null | awk '$1 == "datadir" { print $2; exit }')"
+SOCKET=$(get_option  mysqld socket "$DATADIR/mysql.sock")
+PIDFILE=$(get_option mysqld pid-file "/var/run/mysqld/mysqld.pid")
+
+if [ ! -d "$DATADIR/mysql" ]; then
+	if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" ]; then
+		echo >&2 'error: database is uninitialized and MYSQL_ROOT_PASSWORD not set'
+		echo >&2 '  Did you forget to add -e MYSQL_ROOT_PASSWORD=... ?'
+		exit 1
+	fi
+
+	mkdir -p "$DATADIR"
+	chown -R mysql:mysql "$DATADIR"
+
+	echo 'Running mysql_install_db'
+	mysql_install_db --user=mysql --datadir="$DATADIR" --rpm --keep-my-cnf
+	echo 'Finished mysql_install_db'
+
+	mysqld --user=mysql --datadir="$DATADIR" --skip-networking &
+	for i in $(seq 30 -1 0); do
+		[ -S "$SOCKET" ] && break
+		echo 'MySQL init process in progress...'
+		sleep 1
+	done
+	if [ $i = 0 ]; then
+		echo >&2 'MySQL init process failed.'
+		exit 1
+	fi
+
+	# These statements _must_ be on individual lines, and _must_ end with
+	# semicolons (no line breaks or comments are permitted).
+	# TODO proper SQL escaping on ALL the things D:
+
+	tempSqlFile=$(mktemp /tmp/mysql-first-time.XXXXXX.sql)
+	cat > "$tempSqlFile" <<-EOSQL
+	-- What's done in this file shouldn't be replicated
+	--  or products like mysql-fabric won't work
+	SET @@SESSION.SQL_LOG_BIN=0;
+
+	DELETE FROM mysql.user ;
+	CREATE USER 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ;
+	GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION ;
+	DROP DATABASE IF EXISTS test ;
+	EOSQL
+
+	if [ "$MYSQL_DATABASE" ]; then
+		echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` ;" >> "$tempSqlFile"
+	fi
+
+	if [ "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
+		echo "CREATE USER '"$MYSQL_USER"'@'%' IDENTIFIED BY '"$MYSQL_PASSWORD"' ;" >> "$tempSqlFile"
+
+		if [ "$MYSQL_DATABASE" ]; then
+			echo "GRANT ALL ON \`"$MYSQL_DATABASE"\`.* TO '"$MYSQL_USER"'@'%' ;" >> "$tempSqlFile"
+		fi
+	fi
+
+	echo 'FLUSH PRIVILEGES ;' >> "$tempSqlFile"
+
+	mysql -uroot < "$tempSqlFile"
+
+	rm -f "$tempSqlFile"
+	kill $(cat $PIDFILE)
+	for i in $(seq 30 -1 0); do
+		[ -f "$PIDFILE" ] || break
+		echo 'MySQL init process in progress...'
+		sleep 1
+	done
+	if [ $i = 0 ]; then
+		echo >&2 'MySQL hangs during init process.'
+		exit 1
+	fi
+	echo 'MySQL init process done. Ready for start up.'
+fi
+
+chown -R mysql:mysql "$DATADIR"
+
+mysqld &
+
+sleep 5
+
+# ------------------------
+
+echo starting platform
+cd /mattermost/bin
+./platform -config=/config_docker.json
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
new file mode 100644
index 000000000..a684ac10d
--- /dev/null
+++ b/docker/dev/Dockerfile
@@ -0,0 +1,50 @@
+# Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+# See License.txt for license information.
+FROM ubuntu:14.04
+
+#
+# Install SQL
+#
+
+ENV MYSQL_ROOT_PASSWORD=mostest
+ENV MYSQL_USER=mmuser
+ENV MYSQL_PASSWORD=mostest
+ENV MYSQL_DATABASE=mattermost_test
+
+RUN groupadd -r mysql && useradd -r -g mysql mysql
+
+RUN apt-get update && apt-get install -y perl --no-install-recommends && rm -rf /var/lib/apt/lists/*
+
+RUN apt-key adv --keyserver pool.sks-keyservers.net --recv-keys A4A9406876FCBD3C456770C88C718D3B5072E1F5
+
+ENV MYSQL_MAJOR 5.6
+ENV MYSQL_VERSION 5.6.25
+
+RUN echo "deb http://repo.mysql.com/apt/debian/ wheezy mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
+
+RUN apt-get update \
+	&& export DEBIAN_FRONTEND=noninteractive \
+	&& apt-get -y install mysql-server \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/lib/mysql && mkdir -p /var/lib/mysql
+
+RUN sed -Ei 's/^(bind-address|log)/#&/' /etc/mysql/my.cnf
+
+VOLUME /var/lib/mysql
+# ---------------------------------------------------------------------------------------------------------------------
+
+WORKDIR /mattermost
+
+# Copy over files
+ADD mattermost.tar.gz /
+ADD config_docker.json /
+ADD docker-entry.sh /
+
+RUN chmod +x /docker-entry.sh
+ENTRYPOINT /docker-entry.sh
+
+# Create default storage directory
+RUN mkdir /mattermost-data/
+
+# Ports
+EXPOSE 80
diff --git a/docker/Dockerrun.aws.json b/docker/dev/Dockerrun.aws.json
index 52bbb2ae5..9f69f1fb1 100755
--- a/docker/Dockerrun.aws.json
+++ b/docker/dev/Dockerrun.aws.json
@@ -1,7 +1,7 @@
 {

   "AWSEBDockerrunVersion": "1",

   "Image": {

-    "Name": "mattermost/platform",

+    "Name": "YOUR_DEV_INSTANCE_HERE",

     "Update": "true"

   },

   "Ports": [

diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json
new file mode 100644
index 000000000..f6b1e7b79
--- /dev/null
+++ b/docker/dev/config_docker.json
@@ -0,0 +1,90 @@
+{
+    "LogSettings": {
+        "ConsoleEnable": true,
+        "ConsoleLevel": "INFO",
+        "FileEnable": true,
+        "FileLevel": "INFO",
+        "FileFormat": "",
+        "FileLocation": ""
+    },
+    "ServiceSettings": {
+        "SiteName": "Mattermost",
+        "Mode" : "dev",
+		"AllowTesting" : true,
+        "UseSSL": false,
+        "Port": "80",
+        "Version": "developer",
+        "Shards": {
+        },
+        "InviteSalt": "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6",
+        "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4",
+        "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t",
+        "AnalyticsUrl": "",
+        "UseLocalStorage": true,
+        "StorageDirectory": "/mattermost/data/"
+    },
+    "SSOSettings": {
+        "gitlab": {
+            "Allow": false,
+            "Secret" : "",
+            "Id": "",
+            "AuthEndpoint": "",
+            "TokenEndpoint": "",
+            "UserApiEndpoint": ""
+        }
+    },
+    "SqlSettings": {
+        "DriverName": "mysql",
+        "DataSource": "mmuser:mostest@tcp(localhost:3306)/mattermost_test?charset=utf8mb4,utf8",
+        "DataSourceReplicas": ["mmuser:mostest@tcp(localhost:3306)/mattermost_test?charset=utf8mb4,utf8"],
+        "MaxIdleConns": 10,
+        "MaxOpenConns": 10,
+        "Trace": false,
+        "AtRestEncryptKey": "Ya0xMrybACJ3sZZVWQC7e31h5nSDWZFS"
+    },
+    "AWSSettings": {
+        "S3AccessKeyId": "",
+        "S3SecretAccessKey": "",
+        "S3Bucket": "",
+        "S3Region": ""
+    },
+    "ImageSettings": {
+        "ThumbnailWidth": 200,
+        "ThumbnailHeight": 0,
+        "PreviewWidth": 1024,
+        "PreviewHeight": 0,
+        "ProfileWidth": 128,
+        "ProfileHeight": 128,
+        "InitialFont": "luximbi.ttf"
+    },
+    "EmailSettings": {
+        "ByPassEmail" : true,
+        "SMTPUsername": "",
+        "SMTPPassword": "",
+        "SMTPServer": "",
+		"UseTLS": false,
+        "FeedbackEmail": "",
+        "FeedbackName": "",
+        "ApplePushServer": "",
+        "ApplePushCertPublic": "",
+        "ApplePushCertPrivate": ""
+    },
+    "PrivacySettings": {
+        "ShowEmailAddress": true,
+        "ShowPhoneNumber": true,
+        "ShowSkypeId": true,
+        "ShowFullName": true
+    },
+    "TeamSettings": {
+        "MaxUsersPerTeam": 150,
+        "AllowPublicLink": true,
+        "AllowValet": false,
+        "TermsLink": "/static/help/configure_links.html",
+        "PrivacyLink": "/static/help/configure_links.html",
+        "AboutLink": "/static/help/configure_links.html",
+        "HelpLink": "/static/help/configure_links.html",
+        "ReportProblemLink": "/static/help/configure_links.html",
+        "TourLink": "/static/help/configure_links.html",
+        "DefaultThemeColor": "#2389D7"
+    }
+}
diff --git a/docker/dev/docker-entry.sh b/docker/dev/docker-entry.sh
new file mode 100755
index 000000000..ce9f91c40
--- /dev/null
+++ b/docker/dev/docker-entry.sh
@@ -0,0 +1,111 @@
+#!/bin/bash
+# Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+# See License.txt for license information.
+
+mkdir -p web/static/js
+
+echo "127.0.0.1 dockerhost" >> /etc/hosts
+/etc/init.d/networking restart
+
+echo configuring mysql
+
+# SQL!!!
+set -e
+
+get_option () {
+	local section=$1
+	local option=$2
+	local default=$3
+	ret=$(my_print_defaults $section | grep '^--'${option}'=' | cut -d= -f2-)
+	[ -z $ret ] && ret=$default
+	echo $ret
+}
+
+
+# Get config
+DATADIR="$("mysqld" --verbose --help 2>/dev/null | awk '$1 == "datadir" { print $2; exit }')"
+SOCKET=$(get_option  mysqld socket "$DATADIR/mysql.sock")
+PIDFILE=$(get_option mysqld pid-file "/var/run/mysqld/mysqld.pid")
+
+if [ ! -d "$DATADIR/mysql" ]; then
+	if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" ]; then
+		echo >&2 'error: database is uninitialized and MYSQL_ROOT_PASSWORD not set'
+		echo >&2 '  Did you forget to add -e MYSQL_ROOT_PASSWORD=... ?'
+		exit 1
+	fi
+
+	mkdir -p "$DATADIR"
+	chown -R mysql:mysql "$DATADIR"
+
+	echo 'Running mysql_install_db'
+	mysql_install_db --user=mysql --datadir="$DATADIR" --rpm --keep-my-cnf
+	echo 'Finished mysql_install_db'
+
+	mysqld --user=mysql --datadir="$DATADIR" --skip-networking &
+	for i in $(seq 30 -1 0); do
+		[ -S "$SOCKET" ] && break
+		echo 'MySQL init process in progress...'
+		sleep 1
+	done
+	if [ $i = 0 ]; then
+		echo >&2 'MySQL init process failed.'
+		exit 1
+	fi
+
+	# These statements _must_ be on individual lines, and _must_ end with
+	# semicolons (no line breaks or comments are permitted).
+	# TODO proper SQL escaping on ALL the things D:
+
+	tempSqlFile=$(mktemp /tmp/mysql-first-time.XXXXXX.sql)
+	cat > "$tempSqlFile" <<-EOSQL
+	-- What's done in this file shouldn't be replicated
+	--  or products like mysql-fabric won't work
+	SET @@SESSION.SQL_LOG_BIN=0;
+
+	DELETE FROM mysql.user ;
+	CREATE USER 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ;
+	GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION ;
+	DROP DATABASE IF EXISTS test ;
+	EOSQL
+
+	if [ "$MYSQL_DATABASE" ]; then
+		echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` ;" >> "$tempSqlFile"
+	fi
+
+	if [ "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
+		echo "CREATE USER '"$MYSQL_USER"'@'%' IDENTIFIED BY '"$MYSQL_PASSWORD"' ;" >> "$tempSqlFile"
+
+		if [ "$MYSQL_DATABASE" ]; then
+			echo "GRANT ALL ON \`"$MYSQL_DATABASE"\`.* TO '"$MYSQL_USER"'@'%' ;" >> "$tempSqlFile"
+		fi
+	fi
+
+	echo 'FLUSH PRIVILEGES ;' >> "$tempSqlFile"
+
+	mysql -uroot < "$tempSqlFile"
+
+	rm -f "$tempSqlFile"
+	kill $(cat $PIDFILE)
+	for i in $(seq 30 -1 0); do
+		[ -f "$PIDFILE" ] || break
+		echo 'MySQL init process in progress...'
+		sleep 1
+	done
+	if [ $i = 0 ]; then
+		echo >&2 'MySQL hangs during init process.'
+		exit 1
+	fi
+	echo 'MySQL init process done. Ready for start up.'
+fi
+
+chown -R mysql:mysql "$DATADIR"
+
+mysqld &
+
+sleep 5
+
+# ------------------------
+
+echo starting platform
+cd /mattermost/bin
+./platform -config=/config_docker.json