From 25ad817b0ad50ce7ab0eb2de7fe08ae647e2404f Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Mon, 1 Aug 2016 16:41:09 +0800
Subject: [PATCH] update drone

---
 drone/arm/README.md          |  5 ++++-
 drone/arm/docker-compose.yml |  2 +-
 drone/docker-compose.yml     |  4 ++--
 gogs/arm/docker-compose.yml  |  2 +-
 mariadb/arm/Dockerfile       | 14 +++++++-------
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/drone/arm/README.md b/drone/arm/README.md
index 295b8e8..9402f00 100644
--- a/drone/arm/README.md
+++ b/drone/arm/README.md
@@ -11,9 +11,11 @@ drone:
     - /var/run/docker.sock:/var/run/docker.sock
   environment:
     - REMOTE_DRIVER=gogs
-    - REMOTE_CONFIG=https://git.easypi.info/?open=false
+    - REMOTE_CONFIG=http://git.easypi.info:3000/?open=false
     - PLUGIN_FILTER=armdrone/*
     - GIN_MODE=release
+  extra_hosts:
+    - git.easypi.info:192.168.31.231
   restart: always
 ```
 
@@ -90,6 +92,7 @@ environment:
 
 ## read more
 
+- <http://readme.drone.io/setup/overview/>
 - <http://readme.drone.io/devs/cli/>
 - <https://github.com/drone-plugins/drone-docker/blob/master/DOCS.md>
 - <https://gist.github.com/philipz/1e7a36560700fdc1ad63>
diff --git a/drone/arm/docker-compose.yml b/drone/arm/docker-compose.yml
index d23a500..6699be6 100644
--- a/drone/arm/docker-compose.yml
+++ b/drone/arm/docker-compose.yml
@@ -7,7 +7,7 @@ drone:
     - /var/run/docker.sock:/var/run/docker.sock
   environment:
     - REMOTE_DRIVER=gogs
-    - REMOTE_CONFIG=https://git.easypi.info/?open=false
+    - REMOTE_CONFIG=http://git.easypi.info:3000/?open=false
     - PLUGIN_FILTER=armdrone/*
     - GIN_MODE=release
   restart: always
diff --git a/drone/docker-compose.yml b/drone/docker-compose.yml
index a2bc76d..fba7957 100644
--- a/drone/docker-compose.yml
+++ b/drone/docker-compose.yml
@@ -1,13 +1,13 @@
 drone:
   image: drone/drone
   ports:
-    - "8000:8000"
+    - "8000:80"
   volumes:
     - ./data:/var/lib/drone
     - /var/run/docker.sock:/var/run/docker.sock
   environment:
     - REMOTE_DRIVER=gogs
-    - REMOTE_CONFIG=https://git.easypi.info/?open=false
+    - REMOTE_CONFIG=http://git.easypi.info:3000/?open=false
     - DEBUG=false
   restart: always
 
diff --git a/gogs/arm/docker-compose.yml b/gogs/arm/docker-compose.yml
index a44326f..bf1b3cf 100644
--- a/gogs/arm/docker-compose.yml
+++ b/gogs/arm/docker-compose.yml
@@ -9,7 +9,7 @@ gogs:
     - mysql
   restart: always
 
-mysql
+mysql:
   image: easypi/mariadb-arm
   ports:
     - "3306:3306"
diff --git a/mariadb/arm/Dockerfile b/mariadb/arm/Dockerfile
index ca0a340..69702b2 100644
--- a/mariadb/arm/Dockerfile
+++ b/mariadb/arm/Dockerfile
@@ -3,18 +3,18 @@
 #
 
 FROM easypi/alpine-arm
-MAINTAINER kev <noreplay@easypi.info>
+MAINTAINER EasyPi Software Foundation
 
 RUN set -xe \
-    && apk add -U bash \
-                  mariadb \
-                  mariadb-client \
-                  tzdata \
+    && apk add --no-cache bash \
+                          mariadb \
+                          mariadb-client \
+                          tzdata \
     && mkdir -p /run/mysqld \
     && chown mysql:mysql /run/mysqld \
     && sed -Ei -e 's/^(bind-address|log)/#&/' \
-               -e 's/^\[mysqld\]$/&\nskip-host-cache\nskip-name-resolve\nuser=mysql/' /etc/mysql/my.cnf \
-    && rm -rf /var/cache/apk/*
+               -e 's/^\[mysqld\]$/&\nskip-host-cache\nskip-name-resolve\nuser=mysql/' \
+               /etc/mysql/my.cnf
 
 COPY docker-entrypoint.sh /