diff --git a/Dockerfile b/Dockerfile index 0013592..a26c14d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ -FROM casjaysdev/alpine:latest AS build +FROM casjaysdevdocker/alpine:latest AS build -ENV \ - ARIANG_VERSION=1.2.3 \ +ENV ARIANG_VERSION=1.2.4 \ DOMAIN=0.0.0.0:8080 RUN apk -U upgrade && \ @@ -9,11 +8,15 @@ RUN apk -U upgrade && \ nginx \ aria2 && \ rm -R /etc/nginx && \ - mkdir -p /aria2/config /aria2/data /usr/local/www/ariang + mkdir -p /aria2/config /aria2/data /tmp/ariang && \ + cd /tmp/ariang && \ + curl -q -LSsf https://github.com/mayswind/AriaNg/releases/download/$ARIANG_VERSION/AriaNg-$ARIANG_VERSION.zip -o /tmp/AriaNg-$ARIANG_VERSION.zip && \ + unzip /tmp/AriaNg-$ARIANG_VERSION.zip && \ + rsync -ahP /tmp/ariang/. /usr/local/www/ariang/ && \ + rm -Rf /tmp/ariang # AriaNG WORKDIR /usr/local/www/ariang -COPY ./src/web/. ./ # config files COPY ./config/. /etc/ @@ -25,12 +28,12 @@ ARG BUILD_DATE="$(date +'%Y-%m-%d %H:%M')" LABEL \ org.label-schema.name="aria2" \ org.label-schema.description="Aria2 downloader and AriaNg webui Docker image based on Alpine Linux" \ - org.label-schema.url="https://github.com/casjaysdev/aria2" \ - org.label-schema.vcs-url="https://github.com/casjaysdev/aria2" \ + org.label-schema.url="https://hub.docker.com/r/casjaysdevdocker/aria2" \ + org.label-schema.vcs-url="https://github.com/casjaysdevdocker/aria2" \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.version=$BUILD_DATE \ org.label-schema.vcs-ref=$BUILD_DATE \ - org.label-schema.license="MIT" \ + org.label-schema.license="WTFPL" \ org.label-schema.vcs-type="Git" \ org.label-schema.schema-version="1.0" \ org.label-schema.vendor="CasjaysDev" \ @@ -40,6 +43,7 @@ WORKDIR /aria2 VOLUME ["/aria2/data", "/aria2/config"] EXPOSE 6800 +EXPOSE 8080 HEALTHCHECK CMD ["/usr/local/bin/entrypoint-aria2.sh", "healthcheck"] ENTRYPOINT ["/usr/local/bin/entrypoint-aria2.sh"]