From e519ae74f5cf996bf9eaa7e1ae1145ef44e6b8d3 Mon Sep 17 00:00:00 2001 From: kev Date: Fri, 14 Aug 2020 18:41:35 +0800 Subject: [PATCH] update aria2 --- aria2/Dockerfile | 10 ++++----- aria2/README.md | 47 +++++++++++++++++++++------------------- aria2/docker-compose.yml | 38 +++++++++++++++++--------------- awx/docker-compose.yml | 6 ++--- 4 files changed, 54 insertions(+), 47 deletions(-) diff --git a/aria2/Dockerfile b/aria2/Dockerfile index 4a07ea8..26dd271 100644 --- a/aria2/Dockerfile +++ b/aria2/Dockerfile @@ -2,20 +2,20 @@ # Dockerfile for aria2 # -FROM alpine -MAINTAINER kev +FROM alpine:3 +MAINTAINER EasyPi Software Foundation ENV TOKEN 00000000-0000-0000-0000-000000000000 RUN set -xe \ - && apk add -U aria2 \ - && rm -rf /var/cache/apk/* \ - && aria2c https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64 -o /usr/local/bin/gosu \ + && apk add --no-cache aria2 \ + && aria2c https://github.com/tianon/gosu/releases/download/1.12/gosu-amd64 -o /usr/local/bin/gosu \ && chmod +x /usr/local/bin/gosu \ && adduser -D aria2 COPY aria2.conf /etc/aria2/ VOLUME /home/aria2 /etc/aria2 +WORKDIR /home/aria2 EXPOSE 6800 CMD set -xe \ diff --git a/aria2/README.md b/aria2/README.md index d55307a..0d98065 100644 --- a/aria2/README.md +++ b/aria2/README.md @@ -30,31 +30,34 @@ aria2 ## docker-compose.yml -``` -aria2: - image: vimagick/aria2 - ports: - - "6800:6800" - volumes: - - "./data:/home/aria2" - - "./keys:/etc/aria2/keys" -# - "./aria2.conf:/etc/aria2/aria2.conf" - environment: - - TOKEN=e6c3778f-6361-4ed0-b126-f2cf8fca06db - restart: always +```yaml +version: "3.8" -yaaw: - image: vimagick/nginx - ports: - - "8080:80" - volumes: - - ./html:/usr/share/nginx/html - restart: always +services: + + aria2: + image: vimagick/aria2 + ports: + - "6800:6800" + volumes: + - ./data:/home/aria2 + - ./keys:/etc/aria2/keys + environment: + - TOKEN=e6c3778f-6361-4ed0-b126-f2cf8fca06db + restart: unless-stopped + + yaaw: + image: nginx:alpine + ports: + - "8080:80" + volumes: + - ./html:/usr/share/nginx/html + restart: unless-stopped ``` ## aria2.conf -``` +```ini dir=/home/aria2 disable-ipv6=true enable-rpc=true @@ -73,7 +76,7 @@ seed-time=0 ## server -``` +```bash $ mkdir -p ~/fig/aria2/{html,keys}/ $ cd ~/fig/aria2/ $ ln -s /home/aria2 data @@ -85,7 +88,7 @@ $ fig up -d ## client -``` +```bash $ scp server:fig/aria2/keys/server.crt /usr/local/share/ca-certificates/ $ update-ca-certificates --fresh diff --git a/aria2/docker-compose.yml b/aria2/docker-compose.yml index 84da022..bc12173 100644 --- a/aria2/docker-compose.yml +++ b/aria2/docker-compose.yml @@ -1,18 +1,22 @@ -aria2: - image: vimagick/aria2 - ports: - - "6800:6800" - volumes: - - "./data:/home/aria2" - - "./keys:/etc/aria2/keys" - environment: - - TOKEN=e6c3778f-6361-4ed0-b126-f2cf8fca06db - restart: always +version: "3.8" -yaaw: - image: vimagick/nginx - ports: - - "8080:80" - volumes: - - ./html:/usr/share/nginx/html - restart: always +services: + + aria2: + image: vimagick/aria2 + ports: + - "6800:6800" + volumes: + - ./data:/home/aria2 + - ./keys:/etc/aria2/keys + environment: + - TOKEN=e6c3778f-6361-4ed0-b126-f2cf8fca06db + restart: unless-stopped + + yaaw: + image: nginx:alpine + ports: + - "8080:80" + volumes: + - ./html:/usr/share/nginx/html + restart: unless-stopped diff --git a/awx/docker-compose.yml b/awx/docker-compose.yml index 59bc344..69b38f5 100644 --- a/awx/docker-compose.yml +++ b/awx/docker-compose.yml @@ -1,5 +1,5 @@ # -# https://github.com/ansible/awx/blob/13.0.0/installer/roles/local_docker/templates/docker-compose.yml.j2 +# https://github.com/ansible/awx/blob/14.0.0/installer/roles/local_docker/templates/docker-compose.yml.j2 # version: '2' @@ -7,7 +7,7 @@ version: '2' services: web: - image: ansible/awx:13.0.0 + image: ansible/awx:14.0.0 container_name: awx_web hostname: awxweb user: root @@ -29,7 +29,7 @@ services: restart: unless-stopped task: - image: ansible/awx:13.0.0 + image: ansible/awx:14.0.0 command: /usr/bin/launch_awx_task.sh container_name: awx_task hostname: awx