ani

aniworld/Dockerfile

@@ -5,23 +5,20 @@ ARG PROXY_PORT
 
 RUN apk add --no-cache \
     python3 \
-    iptables 
+    iptables
 
 ADD https://github.com/semigodking/redsocks/releases/download/release-0.71/redsocks2-x86_64-release-0.71 /bin/redsocks2
 RUN chmod +x /bin/redsocks2
 
 COPY redsocks.conf /etc/redsocks.conf
 RUN sed -i "s/vPROXY-SERVER/${PROXY_SERVER}/g" /etc/redsocks.conf && \
-    sed -i "s/vPROXY-PORT/${PROXY_PORT}/g" /etc/redsocks.conf 
+    sed -i "s/vPROXY-PORT/${PROXY_PORT}/g" /etc/redsocks.conf
 
-RUN mkdir /services && mkdir /data
+RUN mkdir -p /services /var/aniworld
 WORKDIR /services
 
-
-# Install AniworldDownloader
-RUN python3 -m venv aniworlddownnloader_venv && \
-    aniworlddownnloader_venv/bin/pip install aniworld && \ 
-    mkdir /data/aniworld_downloads
+RUN python3 -m venv aniworlddownloader_venv && \
+    aniworlddownloader_venv/bin/pip install --no-cache-dir aniworld
 
 WORKDIR /
 COPY entrypoint.sh /entrypoint.sh

aniworld/entrypoint.sh

@@ -1,7 +1,8 @@
 #!/usr/share/env bash
-iptables -t nat -A OUTPUT -p tcp --dport 80 -j REDIRECT --to-port 12345 
+iptables -t nat -A OUTPUT -p tcp --dport 80 -j REDIRECT --to-port 12345
 iptables -t nat -A OUTPUT -p tcp --dport 443 -j REDIRECT --to-port 12345
+
 redsocks2 -c /etc/redsocks.conf
-/services/aniworlddownnloader_venv/bin/aniworld --web-ui --no-browser --web-expose --web-port 3000 --output-dir /data/aniworld_downloads &
+/services/aniworlddownloader_venv/bin//aniworld --web-ui --no-browser --web-expose --web-port 3000 --output-dir /var/aniworld/downloads &
 
 while true; do sleep 1000; done

compose.yml

@@ -8,6 +8,7 @@ services:
         - "PROXY_SERVER=i2pendpoint.arpa"
         - "PROXY_PORT=4444"
     pull_policy: build
+    user: "0:0"
     image: katzenkralle/aniworld_served:latest
 
     networks:
@@ -15,11 +16,9 @@ services:
     
     cap_add:
       - NET_ADMIN 
-      - NET_RAW
-
     
-    #volumes:
-    #  - data_aniworld:/data/aniworld_downloads
+    volumes:
+      - data_aniworld:/var/aniworld/downloads
 
     labels:
       traefik.enable: true
@@ -44,7 +43,7 @@ services:
 
     labels:
       traefik.enable: true
-      traefik.http.routers.i2psnark.rule: Host(`i2psnark.arpa.urmel.de`) && PathPrefix(`/i2psnark/`)
+      traefik.http.routers.i2psnark.rule: "Host(`i2psnark.arpa.urmel.de`) && (PathPrefix(`/i2psnark/`) || Path(`/`))"
       traefik.http.routers.i2psnark.entrypoints: https
       traefik.http.routers.i2psnark.tls: "true"
       traefik.http.routers.i2psnark.tls.certresolver: hetzner
@@ -52,9 +51,13 @@ services:
       traefik.http.routers.i2psnark.service: i2psnark
       traefik.http.services.i2psnark.loadbalancer.server.port: "8002"
 
+      traefik.http.middlewares.i2psnark-redirect.redirectregex.regex: "^/$"
+      traefik.http.middlewares.i2psnark-redirect.redirectregex.replacement: "/i2psnark/"
+      traefik.http.middlewares.i2psnark-redirect.redirectregex.permanent: "true"
+
       traefik.http.middlewares.i2psnark-headers.headers.customRequestHeaders.Host: i2psnark.arpa.urmel.de
       traefik.http.middlewares.i2psnark-headers.headers.customRequestHeaders.X-Forwarded-Proto: https
-      traefik.http.routers.i2psnark.middlewares: i2psnark-headers, traefik-auth
+      traefik.http.routers.i2psnark.middlewares: i2psnark-redirect,i2psnark-headers,traefik-auth
 
 networks:
   proxy:
@@ -67,9 +70,9 @@ volumes:
       type: nfs4
       o: addr=217.100.0.2,rw,noatime,tcp
       device: ":/mnt/Main/servicesData/i2psnark"
+  config_i2psnark:
   data_aniworld:
     driver_opts:
       type: nfs4
       o: addr=217.100.0.2,rw,noatime,tcp
       device: ":/mnt/Main/servicesData/aniworld"
-  config_i2psnark: