Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit 0b9931f

Browse files
committed
chore: merge branch 'config' into dev
2 parents d81a770 + c83b0f2 commit 0b9931f

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

.travis.yml

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ addons:
1111
- libgconf-2-4
1212

1313
before_install:
14+
- mkdir -p ~/bin && curl -sSL -o ~/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && chmod +x ~/bin/jq
15+
- export PATH=$PATH:~/bin
16+
- jq --version
1417
- sudo chown -R travis ./travis/install_node.sh
1518
- sudo chmod +x ./travis/install_node.sh
1619
- ./travis/install_node.sh

deploy/dev/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ ADD web.tar.gz /root/web
66
RUN npm install -g pm2 --registry=https://registry.npm.taobao.org
77
RUN cd /root/web/ && npm install --registry=https://registry.npm.taobao.org
88

9+
RUN mkdir -p ~/bin && curl -sSL -o ~/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && chmod +x ~/bin/jq
10+
RUN export PATH=$PATH:~/bin
11+
RUN jq --version
12+
913
RUN cd /root/web/ && make build.dev
1014

1115
ADD loader.sh /usr/local/bin/loader.sh

deploy/production/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ RUN npm install -g pm2 --registry=https://registry.npm.taobao.org
77
RUN cd /root/web/ && npm install --registry=https://registry.npm.taobao.org
88
RUN cd /root/web/ && npm i terser@3.14
99

10+
RUN mkdir -p ~/bin && curl -sSL -o ~/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && chmod +x ~/bin/jq
11+
RUN export PATH=$PATH:~/bin
12+
RUN jq --version
13+
1014
RUN cd /root/web/ && make build.prod
1115

1216
ADD loader.sh /usr/local/bin/loader.sh

0 commit comments

Comments
 (0)