update aria2

aria2/Dockerfile

@@ -2,20 +2,20 @@
 # Dockerfile for aria2
 #
 
-FROM alpine
+FROM alpine:3
-MAINTAINER kev <noreply@easypi.pro>
+MAINTAINER EasyPi Software Foundation
 
 ENV TOKEN 00000000-0000-0000-0000-000000000000
 
 RUN set -xe \
-    && apk add -U aria2 \
+    && apk add --no-cache aria2 \
-    && rm -rf /var/cache/apk/* \
+    && aria2c https://github.com/tianon/gosu/releases/download/1.12/gosu-amd64 -o /usr/local/bin/gosu \
-    && aria2c https://github.com/tianon/gosu/releases/download/1.10/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 \

aria2/README.md

@@ -30,31 +30,34 @@ aria2
 
 ## docker-compose.yml
 
-```
+```yaml
-aria2:
+version: "3.8"
-  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
 
-yaaw:
+services:
-  image: vimagick/nginx
+
-  ports:
+  aria2:
-    - "8080:80"
+    image: vimagick/aria2
-  volumes:
+    ports:
-    - ./html:/usr/share/nginx/html
+      - "6800:6800"
-  restart: always
+    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
 

aria2/docker-compose.yml

@@ -1,18 +1,22 @@
-aria2:
+version: "3.8"
-  image: vimagick/aria2
-  ports:
-    - "6800:6800"
-  volumes:
-    - "./data:/home/aria2"
-    - "./keys:/etc/aria2/keys"
-  environment:
-    - TOKEN=e6c3778f-6361-4ed0-b126-f2cf8fca06db
-  restart: always
 
-yaaw:
+services:
-  image: vimagick/nginx
+
-  ports:
+  aria2:
-    - "8080:80"
+    image: vimagick/aria2
-  volumes:
+    ports:
-    - ./html:/usr/share/nginx/html
+      - "6800:6800"
-  restart: always
+    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

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