From 55c3dd4f5c7954e390b84d3cb210d4b9860e96fb Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 9 Feb 2016 15:59:16 -0500 Subject: [PATCH] Updating dockerfiles for 2.0 --- docker/1.2/Dockerrun.aws.zip | Bin 867 -> 0 bytes docker/1.2/Dockerrun.aws/Dockerrun.aws.json | 13 -- docker/1.2/config_docker.json | 95 --------------- docker/1.3/Dockerfile | 49 -------- docker/1.3/Dockerrun.aws.zip | Bin 867 -> 0 bytes .../.ebextensions/01_files.config | 14 --- docker/1.3/README.md | 23 ---- docker/1.3/docker-entry.sh | 111 ------------------ docker/{1.2 => 2.0}/Dockerfile | 2 +- docker/2.0/Dockerrun.aws.zip | Bin 0 -> 1369 bytes docker/2.0/Dockerrun.aws/.ebextensions/.zip | Bin 0 -> 338 bytes .../.ebextensions/01_files.config | 0 .../Dockerrun.aws/Dockerrun.aws.json | 2 +- docker/{1.2 => 2.0}/README.md | 0 docker/{1.3 => 2.0}/config_docker.json | 26 +++- docker/{1.2 => 2.0}/docker-entry.sh | 0 16 files changed, 26 insertions(+), 309 deletions(-) delete mode 100644 docker/1.2/Dockerrun.aws.zip delete mode 100755 docker/1.2/Dockerrun.aws/Dockerrun.aws.json delete mode 100644 docker/1.2/config_docker.json delete mode 100644 docker/1.3/Dockerfile delete mode 100644 docker/1.3/Dockerrun.aws.zip delete mode 100644 docker/1.3/Dockerrun.aws/.ebextensions/01_files.config delete mode 100644 docker/1.3/README.md delete mode 100755 docker/1.3/docker-entry.sh rename docker/{1.2 => 2.0}/Dockerfile (93%) create mode 100644 docker/2.0/Dockerrun.aws.zip create mode 100644 docker/2.0/Dockerrun.aws/.ebextensions/.zip rename docker/{1.2 => 2.0}/Dockerrun.aws/.ebextensions/01_files.config (100%) rename docker/{1.3 => 2.0}/Dockerrun.aws/Dockerrun.aws.json (75%) rename docker/{1.2 => 2.0}/README.md (100%) rename docker/{1.3 => 2.0}/config_docker.json (73%) rename docker/{1.2 => 2.0}/docker-entry.sh (100%) diff --git a/docker/1.2/Dockerrun.aws.zip b/docker/1.2/Dockerrun.aws.zip deleted file mode 100644 index 4de6ec362dc99dbab209e0dafd0b4e34f67c64d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 867 zcmWIWW@Zs#U|`^2kSNM@zgpI^YzB~b35bOlWEfoXle1Hcic0hJ63dJAvWoNbLPIzi zm=!)cg!uz;X$3a}Bg+eB1_qWCpbp)h-CTzp1YD~R)^h}RXRlG2yWUAa&_(x1(#5kv zXWq4(JfimG{@jyMyx->)FQ4zXiRaq)({-B8jc1qy2H++1sBoj7s^o$X+^bEVP|T?&KePu?z2yA7 zw9It4u~>p_>$$+J!v;KT55CWHIz3Oi)kz{H{f1;y^6Jh`ZOPM_lP?{V3{z&z@JGS2k2;U3~L)BTu$j;xW&ZFcU+o zE=RMTMUu9^V_tvJ*R;1UxY*L1uCnh?LdmbYy%$&9lab+_U@I%Wl*R8&%&mu<0p5&E za?H5Wj|4cBfx*M@wh_d{mYP^0sR<*bLFVF$Gl;ni3<3;q9iITrMUO$CnOI{F;a1G} hL%4NGqYlu?sAgisCN3*j*+3p;210(IA$Ck49sqTU9RC0S diff --git a/docker/1.2/Dockerrun.aws/Dockerrun.aws.json b/docker/1.2/Dockerrun.aws/Dockerrun.aws.json deleted file mode 100755 index c32a998e4f..0000000000 --- a/docker/1.2/Dockerrun.aws/Dockerrun.aws.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "AWSEBDockerrunVersion": "1", - "Image": { - "Name": "mattermost/platform:1.2", - "Update": "true" - }, - "Ports": [ - { - "ContainerPort": "80" - } - ], - "Logging": "/var/log/" -} diff --git a/docker/1.2/config_docker.json b/docker/1.2/config_docker.json deleted file mode 100644 index c23a72cd1d..0000000000 --- a/docker/1.2/config_docker.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "ServiceSettings": { - "ListenAddress": ":80", - "MaximumLoginAttempts": 10, - "SegmentDeveloperKey": "", - "GoogleDeveloperKey": "", - "EnableOAuthServiceProvider": false, - "EnableIncomingWebhooks": false, - "EnableOutgoingWebhooks": false, - "EnablePostUsernameOverride": false, - "EnablePostIconOverride": false, - "EnableTesting": false, - "EnableSecurityFixAlert": true - }, - "TeamSettings": { - "SiteName": "Mattermost", - "MaxUsersPerTeam": 50, - "EnableTeamCreation": true, - "EnableUserCreation": true, - "RestrictCreationToDomains": "", - "RestrictTeamNames": true, - "EnableTeamListing": false - }, - "SqlSettings": { - "DriverName": "mysql", - "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8", - "DataSourceReplicas": [], - "MaxIdleConns": 10, - "MaxOpenConns": 10, - "Trace": false, - "AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QVg" - }, - "LogSettings": { - "EnableConsole": false, - "ConsoleLevel": "INFO", - "EnableFile": true, - "FileLevel": "INFO", - "FileFormat": "", - "FileLocation": "" - }, - "FileSettings": { - "DriverName": "local", - "Directory": "/mattermost/data/", - "EnablePublicLink": true, - "PublicLinkSalt": "A705AklYF8MFDOfcwh3I488G8vtLlVip", - "ThumbnailWidth": 120, - "ThumbnailHeight": 100, - "PreviewWidth": 1024, - "PreviewHeight": 0, - "ProfileWidth": 128, - "ProfileHeight": 128, - "InitialFont": "luximbi.ttf", - "AmazonS3AccessKeyId": "", - "AmazonS3SecretAccessKey": "", - "AmazonS3Bucket": "", - "AmazonS3Region": "" - }, - "EmailSettings": { - "EnableSignUpWithEmail": true, - "SendEmailNotifications": false, - "RequireEmailVerification": false, - "FeedbackName": "", - "FeedbackEmail": "", - "SMTPUsername": "", - "SMTPPassword": "", - "SMTPServer": "", - "SMTPPort": "", - "ConnectionSecurity": "", - "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS", - "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL", - "ApplePushServer": "", - "ApplePushCertPublic": "", - "ApplePushCertPrivate": "" - }, - "RateLimitSettings": { - "EnableRateLimiter": true, - "PerSec": 10, - "MemoryStoreSize": 10000, - "VaryByRemoteAddr": true, - "VaryByHeader": "" - }, - "PrivacySettings": { - "ShowEmailAddress": true, - "ShowFullName": true - }, - "GitLabSettings": { - "Enable": false, - "Secret": "", - "Id": "", - "Scope": "", - "AuthEndpoint": "", - "TokenEndpoint": "", - "UserApiEndpoint": "" - } -} diff --git a/docker/1.3/Dockerfile b/docker/1.3/Dockerfile deleted file mode 100644 index 4a25198af5..0000000000 --- a/docker/1.3/Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright (c) 2015 Mattermost, 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-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 perl wget 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/v1.3.0/mattermost.tar.gz / -RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /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/1.3/Dockerrun.aws.zip b/docker/1.3/Dockerrun.aws.zip deleted file mode 100644 index dd201d990f5e2d9f9010665c96bacac21254bea9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 867 zcmWIWW@Zs#U|`^2FfHwLegmJcHgq2osGcdBeU}j)oNdfB6?b*$B$U(rh`d~draCi2Gi6#5E99;yq3Us@g zdmHQ)Rui5*p}t%#+w@NLxw&;#CygTR>;FE>7ccLA<>>6i+YWKKvRR&SdnmA`Jm||T zmH9arI1U3@NLYc);q&!5vKwelG$R9pEQUD-hVf~cIjO~Z$@zI{ znd$h9-FhxC>#zY2+k@}(oKDY^ZgrAKNxvc4l)SpLQ(N+M=HyF>8npsogeJaTmGfXSW-k+;w&R!m9fWF-HQ~Lob`e=SIKPFkg1XQRw9E9?xk% z+)qvSnPXk?CP3qd(%++N{wn0XzIvbY*0bl;=amhWSr^~D-N=(|mUzrFCCtRos>{)= zXOX1s@0izL^fm463of=ar>pEclu+{PZtukv_he*vC)mo0FJXy z^dkWdWnl0yyln(Av85(fNNU0eX^^?N;tXOg1A_p=TgN9rbJ1fEXeQR!L%0<){t#|m e(x?M;GOC#vv5CtHRyL4FnSqcWXowvXhz9^=W)Zdk diff --git a/docker/1.3/Dockerrun.aws/.ebextensions/01_files.config b/docker/1.3/Dockerrun.aws/.ebextensions/01_files.config deleted file mode 100644 index 7f40a8b34f..0000000000 --- a/docker/1.3/Dockerrun.aws/.ebextensions/01_files.config +++ /dev/null @@ -1,14 +0,0 @@ -files: - "/etc/nginx/conf.d/proxy.conf": - mode: "000755" - owner: root - group: root - content: | - client_max_body_size 50M; - "/opt/elasticbeanstalk/hooks/appdeploy/post/init.sh": - mode: "000755" - owner: root - group: root - content: | - #!/usr/bin/env bash - gpasswd -a ec2-user docker diff --git a/docker/1.3/README.md b/docker/1.3/README.md deleted file mode 100644 index f737a15549..0000000000 --- a/docker/1.3/README.md +++ /dev/null @@ -1,23 +0,0 @@ -Mattermost -========== - -http:/mattermost.org - -Mattermost is an open-source team communication service. It brings team messaging and file sharing into one place, accessible across PCs and phones, with archiving and search. - -Installing Mattermost -===================== - -To run an instance of the latest version of mattermost on your local machine you can run: - -`docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform` - -To update this image to the latest version you can run: - -`docker pull mattermost/platform` - -To run an instance of the latest code from the master branch on GitHub you can run: - -`docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform:dev` - -Any questions, please visit http://forum.mattermost.org diff --git a/docker/1.3/docker-entry.sh b/docker/1.3/docker-entry.sh deleted file mode 100755 index 6bd2a1263b..0000000000 --- a/docker/1.3/docker-entry.sh +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/bash -# Copyright (c) 2015 Mattermost, 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/1.2/Dockerfile b/docker/2.0/Dockerfile similarity index 93% rename from docker/1.2/Dockerfile rename to docker/2.0/Dockerfile index e00c4e5ca6..5cf3c66534 100644 --- a/docker/1.2/Dockerfile +++ b/docker/2.0/Dockerfile @@ -34,7 +34,7 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -ADD https://github.com/mattermost/platform/releases/download/v1.2.1/mattermost.tar.gz / +ADD https://github.com/mattermost/platform/releases/download/v2.0.0-rc1/mattermost.tar.gz / RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz ADD config_docker.json / ADD docker-entry.sh / diff --git a/docker/2.0/Dockerrun.aws.zip b/docker/2.0/Dockerrun.aws.zip new file mode 100644 index 0000000000000000000000000000000000000000..bfbe56400631e84f8e5a239ed904a025e6c36aff GIT binary patch literal 1369 zcmWIWW@Zs#U|`^2cu?o*!EkQ=;u%2RB_I}JkYRAiPtHy)Dk{y>ODr$e%PP*#3k~69 zU{(&=6$Zkk72FJrEH9WD7+6w(I&^z>a~*OJaIHRA&k@`$y;f!JdM5!v7u_RC7tRWu zdDn9Ch}x6;cTYy~exFyoe7@f%o@?Jv*KJ;W{kT#2!?c}iH5?`$WJ+6H@Zm*{PL;3W z{0rGE{Yukpw+LEU;Cto^zeQDwb zW*>d0`7J-r+f68A*9cWi?Y60kyT~;^yWQ~QuB+=8R^4ZaITFYodf6mCH~OuH`LZjH zLMM0kcuxD_ermeU9P5fV0UAG){vKWPS0V59)%%>co;|NVuWYEyy7=bpMxJc5#ABW* zVJ3!FU5;iwizID-$GrZcuW4^zaIvL1U1i^)gpyx(doQlICnLiODr$e%PP*#3k~69 zU{(&=6$Zkk72FJrEH9WD7+6w(I&^z>a~*OJaIHRA&k@`$y;f!JdM5!v7u_RC7tRWu zdDn9Ch}x6;cTYy~exFyoe7@f%o@?Jv*KJ;W{kT#2!?c}iH5?`$WJ+6H@Zm*{PL;3W z{0rGE{Yukpw