diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-11 14:07:35 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-11 14:07:35 -0400 |
| commit | 083433dc0f60852d4f268b915306d095799a6d1a (patch) | |
| tree | a4efbf05f1c2d0d47969cecde656fca8dbbbbb95 /docker/dev | |
| parent | 6a333f201811b20eda8c0756cd6e27aa8c1b0288 (diff) | |
| download | chat-083433dc0f60852d4f268b915306d095799a6d1a.tar.gz chat-083433dc0f60852d4f268b915306d095799a6d1a.tar.bz2 chat-083433dc0f60852d4f268b915306d095799a6d1a.zip | |
Updating dockerfiles to allow for previewing of latest master and fixing local docker build so it works on osx
Diffstat (limited to 'docker/dev')
| -rw-r--r-- | docker/dev/Dockerfile | 7 | ||||
| -rwxr-xr-x | docker/dev/Dockerrun.aws.json | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index a684ac10d..cdfdc1845 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -13,8 +13,6 @@ 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 @@ -24,7 +22,7 @@ RUN echo "deb http://repo.mysql.com/apt/debian/ wheezy mysql-${MYSQL_MAJOR}" > / RUN apt-get update \ && export DEBIAN_FRONTEND=noninteractive \ - && apt-get -y install mysql-server \ + && apt-get -y install perl wget mysql-server \ && rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/mysql && mkdir -p /var/lib/mysql @@ -36,7 +34,8 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -ADD mattermost.tar.gz / +RUN wget --no-check-certificate https://s3.amazonaws.com/mattermost-travis-master/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/dev/Dockerrun.aws.json b/docker/dev/Dockerrun.aws.json index 9f69f1fb1..ae847ef80 100755 --- a/docker/dev/Dockerrun.aws.json +++ b/docker/dev/Dockerrun.aws.json @@ -1,7 +1,7 @@ {
"AWSEBDockerrunVersion": "1",
"Image": {
- "Name": "YOUR_DEV_INSTANCE_HERE",
+ "Name": "mattermost/platform:dev",
"Update": "true"
},
"Ports": [
|