Merge branch 'master' into junwei/custom-user-binding

This commit is contained in:
2019-07-18 22:19:26 +10:00
6 changed files with 8 additions and 6 deletions
+3 -3
View File
@@ -12,10 +12,10 @@ jobs:
- stage: "build and push docker image"
script: |
docker --version
docker build -t wahyd4/aria2-ui:2.0.${TRAVIS_BUILD_NUMBER} .
docker build -t wahyd4/aria2-ui:3.0.${TRAVIS_BUILD_NUMBER} .
if [ "${TRAVIS_BRANCH}" = "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker tag wahyd4/aria2-ui:2.0.$TRAVIS_BUILD_NUMBER wahyd4/aria2-ui:latest
docker push wahyd4/aria2-ui:2.0.$TRAVIS_BUILD_NUMBER
docker tag wahyd4/aria2-ui:3.0.$TRAVIS_BUILD_NUMBER wahyd4/aria2-ui:latest
docker push wahyd4/aria2-ui:3.0.$TRAVIS_BUILD_NUMBER
docker push wahyd4/aria2-ui:latest
fi
+1
View File
@@ -5,6 +5,7 @@
proxy /jsonrpc localhost:6800 {
transparent
websocket
}
log stdout
+1 -1
View File
@@ -32,7 +32,7 @@ ADD Caddyfile SecureCaddyfile /usr/local/caddy/
RUN mkdir /usr/local/www/aria2/Download \
&& cd /usr/local/www/aria2 \
&& chmod +rw /app/conf/aria2.session \
&& version=1.1.0 \
&& version=1.1.1 \
&& wget -N --no-check-certificate https://github.com/mayswind/AriaNg/releases/download/${version}/AriaNg-${version}.zip \
&& unzip AriaNg-${version}.zip \
&& rm -rf AriaNg-${version}.zip \
+1
View File
@@ -5,6 +5,7 @@
proxy /jsonrpc localhost:6800 {
transparent
websocket
}
gzip
+1 -1
View File
@@ -26,7 +26,7 @@ COPY Caddyfile SecureCaddyfile /usr/local/caddy/
# AriaNg
RUN mkdir /usr/local/www/aria2/Download && cd /usr/local/www/aria2 \
&& chmod +rw /app/conf/aria2.session \
&& version=1.1.0 \
&& version=1.1.1 \
&& wget -N --no-check-certificate https://github.com/mayswind/AriaNg/releases/download/${version}/AriaNg-${version}.zip && unzip AriaNg-${version}.zip && rm -rf AriaNg-${version}.zip \
&& chmod -R 755 /usr/local/www/aria2 \
&& sed -i 's/6800/80/g' /usr/local/www/aria2/js/aria-ng*.js
+1 -1
View File
@@ -26,7 +26,7 @@ COPY Caddyfile SecureCaddyfile /usr/local/caddy/
# AriaNg
RUN mkdir /usr/local/www/aria2/Download && cd /usr/local/www/aria2 \
&& chmod +rw /app/conf/aria2.session \
&& version=1.1.0 \
&& version=1.1.1 \
&& wget -N --no-check-certificate https://github.com/mayswind/AriaNg/releases/download/${version}/AriaNg-${version}.zip && unzip AriaNg-${version}.zip && rm -rf AriaNg-${version}.zip \
&& chmod -R 755 /usr/local/www/aria2 \
&& sed -i 's/6800/80/g' /usr/local/www/aria2/js/aria-ng*.js