Skip to content

Commit e84b0e5

Browse files
committed
update arm
1 parent 0f402d1 commit e84b0e5

File tree

5 files changed

+40
-29
lines changed

5 files changed

+40
-29
lines changed

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,17 @@ _内置数据库,容器内多进程非Docker推荐做法,只为方便。_
1919
## 版本选择
2020

2121
full: 完整功能,内置数据库
22+
2223
nodb: 完整功能,不包含数据库
24+
2325
lite: 仅有leanote程序,网页版不支持导出pdf和备份数据库,供客户端用户使用
2426

2527
具体如下
2628

2729
- latest([Dockerfile](https://github.com/axboy/docker-leanote/blob/master/Dockerfile))
2830
- nodb([Dockerfile](https://github.com/axboy/leanote/blob/master/nodb/Dockerfile))
2931
- lite([Dockerfile](https://github.com/axboy/leanote/blob/master/lite/Dockerfile))
30-
- nodb-arm([Dockerfile](https://github.com/axboy/leanote/blob/master/nodb-arm/Dockerfile))
31-
- lite-arm([Dockerfile](https://github.com/axboy/leanote/blob/master/lite-arm/Dockerfile))
32+
- lite-arm([Dockerfile](https://github.com/axboy/leanote/blob/master/lite/Dockerfile-arm))
3233
- ~~2.5([Dockerfile](https://github.com/axboy/leanote/blob/2.5/Dockerfile))~~
3334
- ~~2.6([Dockerfile](https://github.com/axboy/leanote/blob/2.6/Dockerfile))~~
3435
- ~~2.6.1([Dockerfile](https://github.com/axboy/leanote/blob/2.6.1/Dockerfile))~~

lite/Dockerfile-arm

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM alpine:3.12
2+
MAINTAINER zcw
3+
ENV TZ=Asia/Shanghai
4+
5+
RUN apk update && apk add tzdata && \
6+
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
7+
mkdir /data/ && \
8+
wget http://static.axboy.cn/leanote/leanote-linux-arm-v2.6.1.bin.tar.gz -O /root/leanote.tar.gz && \
9+
tar -xzf /root/leanote.tar.gz -C /data/ && \
10+
chmod a+x /data/leanote/bin/run.sh && \
11+
rm -f /root/leanote.tar.gz
12+
13+
EXPOSE 9000
14+
CMD sh /data/leanote/bin/run.sh

nodb-arm/Dockerfile

-19
This file was deleted.

nodb-arm/run.sh

-8
This file was deleted.

nodb/Dockerfile-arm

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
FROM madnight/alpine-wkhtmltopdf-builder:0.12.5-alpine3.10-705860667 as builder
2+
FROM axboy/leanote:latest as fontBuilder
3+
4+
FROM alpine:3.12
5+
MAINTAINER zcw
6+
ENV TZ=Asia/Shanghai
7+
8+
COPY --from=builder /bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
9+
COPY --from=fontBuilder /usr/share/fonts/truetype /usr/share/fonts/truetype
10+
11+
RUN apk update && apk add --no-cache tzdata mongodb-tools \
12+
libgcc libstdc++ libx11 glib libxrender libxext libintl \
13+
ttf-dejavu ttf-droid ttf-freefont ttf-liberation ttf-ubuntu-font-family && \
14+
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
15+
mkdir /data/ && \
16+
wget http://static.axboy.cn/leanote/leanote-linux-arm-v2.6.1.bin.tar.gz -O /root/leanote.tar.gz && \
17+
tar -xzf /root/leanote.tar.gz -C /data/ && \
18+
chmod +x /data/leanote/bin/run.sh && \
19+
chmod +x /usr/local/bin/wkhtmltopdf && \
20+
rm -f /root/leanote.tar.gz
21+
22+
EXPOSE 9000
23+
CMD sh /data/leanote/bin/run.sh

0 commit comments

Comments
 (0)