Skip to content

Commit 25ad817

Browse files
committed
update drone
1 parent b89ebc6 commit 25ad817

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

drone/arm/README.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ drone:
1111
- /var/run/docker.sock:/var/run/docker.sock
1212
environment:
1313
- REMOTE_DRIVER=gogs
14-
- REMOTE_CONFIG=https://git.easypi.info/?open=false
14+
- REMOTE_CONFIG=http://git.easypi.info:3000/?open=false
1515
- PLUGIN_FILTER=armdrone/*
1616
- GIN_MODE=release
17+
extra_hosts:
18+
- git.easypi.info:192.168.31.231
1719
restart: always
1820
```
1921
@@ -90,6 +92,7 @@ environment:
9092
9193
## read more
9294
95+
- <http://readme.drone.io/setup/overview/>
9396
- <http://readme.drone.io/devs/cli/>
9497
- <https://github.com/drone-plugins/drone-docker/blob/master/DOCS.md>
9598
- <https://gist.github.com/philipz/1e7a36560700fdc1ad63>

drone/arm/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ drone:
77
- /var/run/docker.sock:/var/run/docker.sock
88
environment:
99
- REMOTE_DRIVER=gogs
10-
- REMOTE_CONFIG=https://git.easypi.info/?open=false
10+
- REMOTE_CONFIG=http://git.easypi.info:3000/?open=false
1111
- PLUGIN_FILTER=armdrone/*
1212
- GIN_MODE=release
1313
restart: always

drone/docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
drone:
22
image: drone/drone
33
ports:
4-
- "8000:8000"
4+
- "8000:80"
55
volumes:
66
- ./data:/var/lib/drone
77
- /var/run/docker.sock:/var/run/docker.sock
88
environment:
99
- REMOTE_DRIVER=gogs
10-
- REMOTE_CONFIG=https://git.easypi.info/?open=false
10+
- REMOTE_CONFIG=http://git.easypi.info:3000/?open=false
1111
- DEBUG=false
1212
restart: always
1313

gogs/arm/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ gogs:
99
- mysql
1010
restart: always
1111

12-
mysql
12+
mysql:
1313
image: easypi/mariadb-arm
1414
ports:
1515
- "3306:3306"

mariadb/arm/Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
#
44

55
FROM easypi/alpine-arm
6-
MAINTAINER kev <[email protected]>
6+
MAINTAINER EasyPi Software Foundation
77

88
RUN set -xe \
9-
&& apk add -U bash \
10-
mariadb \
11-
mariadb-client \
12-
tzdata \
9+
&& apk add --no-cache bash \
10+
mariadb \
11+
mariadb-client \
12+
tzdata \
1313
&& mkdir -p /run/mysqld \
1414
&& chown mysql:mysql /run/mysqld \
1515
&& sed -Ei -e 's/^(bind-address|log)/#&/' \
16-
-e 's/^\[mysqld\]$/&\nskip-host-cache\nskip-name-resolve\nuser=mysql/' /etc/mysql/my.cnf \
17-
&& rm -rf /var/cache/apk/*
16+
-e 's/^\[mysqld\]$/&\nskip-host-cache\nskip-name-resolve\nuser=mysql/' \
17+
/etc/mysql/my.cnf
1818

1919
COPY docker-entrypoint.sh /
2020

0 commit comments

Comments
 (0)