Commit 67114843 authored by nanahira's avatar nanahira

Merge branch 'mc'

parents a78f29cf be0e1dc0
...@@ -5,7 +5,7 @@ RUN npm install -g pm2 ...@@ -5,7 +5,7 @@ RUN npm install -g pm2
# apt # apt
RUN apt update && \ RUN apt update && \
env DEBIAN_FRONTEND=noninteractive apt install -y wget git build-essential libevent-dev libsqlite3-dev mono-complete p7zip-full redis-server && \ env DEBIAN_FRONTEND=noninteractive apt install -y wget git build-essential libevent-dev libsqlite3-dev mono-complete p7zip-full redis-server python3 && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# srvpro # srvpro
......
...@@ -3,7 +3,7 @@ FROM node:12-buster-slim ...@@ -3,7 +3,7 @@ FROM node:12-buster-slim
# apt # apt
RUN apt update && \ RUN apt update && \
env DEBIAN_FRONTEND=noninteractive apt install -y wget git build-essential libsqlite3-dev libevent-dev p7zip-full && \ env DEBIAN_FRONTEND=noninteractive apt install -y wget git build-essential libsqlite3-dev libevent-dev p7zip-full python3 && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# srvpro # srvpro
......
...@@ -410,7 +410,7 @@ function run7z(params, callback) { ...@@ -410,7 +410,7 @@ function run7z(params, callback) {
}); });
proc.on('close', function (code) { proc.on('close', function (code) {
callback(code === 0 ? null : "exit " + code); callback(code === 0 ? null : "exit " + code);
} });
} }
//生成更新包,异步 //生成更新包,异步
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment