Merge pull request #34 from wahyd4/junwei/update-ariang-arms

Update AriaNg version to 1.1.0 and upgrade the arm dockerfiles to date.
This commit is contained in:
2019-05-18 00:36:59 +10:00
committed by GitHub
4 changed files with 26 additions and 38 deletions
+4 -19
View File
@@ -5,31 +5,16 @@ addons:
apt:
packages:
- docker-ce
env:
global:
- NAME=aria2-ui
- CACHE_FOLDER=$HOME/docker-images
- CACHE_FILE=${CACHE_FOLDER}/${NAME}-${TRAVIS_COMMIT}.tgz
jobs:
include:
- stage: build docker image
script:
- docker --version
- docker build -t wahyd4/aria2-ui:2.0.${TRAVIS_BUILD_NUMBER} .
- mkdir -p ${CACHE_FOLDER}
- docker save wahyd4/aria2-ui:2.0.${TRAVIS_BUILD_NUMBER} | gzip -c > ${CACHE_FILE}
- stage: push docker image
if: branch = master
- stage: build and push docker image
script: |
if [[ -f ${CACHE_FILE} ]]; then docker load -i ${CACHE_FILE}; fi
if [ "${TRAVIS_BRANCH}" == "master" ]; then
docker --version
docker build -t wahyd4/aria2-ui:2.0.${TRAVIS_BUILD_NUMBER} .
if [ "${TRAVIS_BRANCH}" == "master" && $TRAVIS_PULL_REQUEST == "false" ]; 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 push wahyd4/aria2-ui:latest
fi
cache:
directories:
- ${CACHE_FOLDER}
+2 -1
View File
@@ -24,7 +24,8 @@ COPY Caddyfile SecureCaddyfile /usr/local/caddy/
# AriaNg
RUN mkdir /usr/local/www/aria2/Download && cd /usr/local/www/aria2 \
&& chmod +rw /root/conf/aria2.session \
&& wget -N --no-check-certificate https://github.com/mayswind/AriaNg/releases/download/1.0.0/AriaNg-1.0.0.zip && unzip AriaNg-1.0.0.zip && rm -rf AriaNg-1.0.0.zip \
&& version=1.1.0 \
&& 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 \
&& chmod +x /root/aria2c.sh
+10 -9
View File
@@ -10,21 +10,22 @@ ENV DOMAIN=0.0.0.0:80
ENV ARIA2_USER=user
ENV ARIA2_PWD=password
RUN apk update && apk add wget bash curl openrc gnupg screen aria2 tar --no-cache
RUN apk update \
&& apk add wget bash curl openrc gnupg screen aria2 tar --no-cache
RUN curl https://getcaddy.com | bash -s personal http.filebrowser
ADD conf /root/conf
COPY aria2c.sh /root
COPY Caddyfile SecureCaddyfile /usr/local/caddy/
RUN curl https://getcaddy.com | bash -s personal
RUN curl -fsSL https://filebrowser.xyz/get.sh | bash
RUN mkdir -p /usr/local/www && mkdir -p /usr/local/www/aria2
ADD conf /root/conf
COPY aria2c.sh /root
COPY Caddyfile SecureCaddyfile /usr/local/caddy/
#AriaNg
# AriaNg
RUN mkdir /usr/local/www/aria2/Download && cd /usr/local/www/aria2 \
&& chmod +rw /root/conf/aria2.session \
&& wget -N --no-check-certificate https://github.com/mayswind/AriaNg/releases/download/1.0.0/AriaNg-1.0.0.zip && unzip AriaNg-1.0.0.zip && rm -rf AriaNg-1.0.0.zip \
&& version=1.1.0 \
&& 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 \
&& chmod +x /root/aria2c.sh
+10 -9
View File
@@ -10,21 +10,22 @@ ENV DOMAIN=0.0.0.0:80
ENV ARIA2_USER=user
ENV ARIA2_PWD=password
RUN apk update && apk add wget bash curl openrc gnupg screen aria2 tar --no-cache
RUN apk update \
&& apk add wget bash curl openrc gnupg screen aria2 tar --no-cache
RUN curl https://getcaddy.com | bash -s personal http.filebrowser
ADD conf /root/conf
COPY aria2c.sh /root
COPY Caddyfile SecureCaddyfile /usr/local/caddy/
RUN curl https://getcaddy.com | bash -s personal
RUN curl -fsSL https://filebrowser.xyz/get.sh | bash
RUN mkdir -p /usr/local/www && mkdir -p /usr/local/www/aria2
ADD conf /root/conf
COPY aria2c.sh /root
COPY Caddyfile SecureCaddyfile /usr/local/caddy/
#AriaNg
# AriaNg
RUN mkdir /usr/local/www/aria2/Download && cd /usr/local/www/aria2 \
&& chmod +rw /root/conf/aria2.session \
&& wget -N --no-check-certificate https://github.com/mayswind/AriaNg/releases/download/1.0.0/AriaNg-1.0.0.zip && unzip AriaNg-1.0.0.zip && rm -rf AriaNg-1.0.0.zip \
&& version=1.1.0 \
&& 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 \
&& chmod +x /root/aria2c.sh