replace deprecated mem_reservation with recommended property. (#23)

Signed-off-by: Tiger Wang <[email protected]>
IceWhaleTech · Mar 7, 2023 · b57d758 · b57d758
1 parent fa69aa7
commit b57d758
Show file tree

Hide file tree

Showing 46 changed files with 869 additions and 731 deletions.
diff --git a/Apps/2FAuth/docker-compose.yml b/Apps/2FAuth/docker-compose.yml
@@ -2,7 +2,10 @@ name: 2fauth
 services:
   2fauth:
     image: 2fauth/2fauth:3.4.2
-    mem_reservation: "67108864"
+    deploy:
+      resources:
+        reservations:
+          memory: 64M
     network_mode: bridge
     ports:
       - target: 8000

diff --git a/Apps/AdGuardHome/docker-compose.yml b/Apps/AdGuardHome/docker-compose.yml
@@ -1,94 +1,97 @@
 name: adguard-home
 services:
-    adguard-home:
-        image: adguard/adguardhome:v0.107.5
-        mem_reservation: "67108864"
-        network_mode: bridge
+  adguard-home:
+    image: adguard/adguardhome:v0.107.5
+    deploy:
+      resources:
+        reservations:
+          memory: 64M
+    network_mode: bridge
+    ports:
+      - target: 53
+        published: "53"
+        protocol: tcp
+      - target: 53
+        published: "53"
+        protocol: udp
+      - target: 3000
+        published: "3000"
+        protocol: tcp
+      - target: 853
+        published: "853"
+        protocol: tcp
+      - target: 784
+        published: "784"
+        protocol: udp
+    restart: unless-stopped
+    volumes:
+      - type: bind
+        source: /DATA/AppData/$AppID/opt/adguardhome/work
+        target: /opt/adguardhome/work
+      - type: bind
+        source: /DATA/AppData/$AppID/opt/adguardhome/conf
+        target: /opt/adguardhome/conf
+    x-casaos:
+      author: CasaOS Team
+      category: Network
+      container:
+        index: /
+        port_map: "3000"
         ports:
-            - target: 53
-              published: "53"
-              protocol: tcp
-            - target: 53
-              published: "53"
-              protocol: udp
-            - target: 3000
-              published: "3000"
-              protocol: tcp
-            - target: 853
-              published: "853"
-              protocol: tcp
-            - target: 784
-              published: "784"
-              protocol: udp
-        restart: unless-stopped
+          - configurable: "no"
+            container: "53"
+            description:
+              en_US: ""
+            protocol: tcp
+          - configurable: "no"
+            container: "53"
+            description:
+              en_US: ""
+            protocol: udp
+          - configurable: "no"
+            container: "3000"
+            description:
+              en_US: ""
+            protocol: tcp
+          - configurable: "no"
+            container: "853"
+            description:
+              en_US: ""
+            protocol: tcp
+          - configurable: "no"
+            container: "784"
+            description:
+              en_US: ""
+            protocol: udp
+        shell: sh
         volumes:
-            - type: bind
-              source: /DATA/AppData/$AppID/opt/adguardhome/work
-              target: /opt/adguardhome/work
-            - type: bind
-              source: /DATA/AppData/$AppID/opt/adguardhome/conf
-              target: /opt/adguardhome/conf
-        x-casaos:
-            author: CasaOS Team
-            category: Network
-            container:
-                index: /
-                port_map: "3000"
-                ports:
-                    - configurable: "no"
-                      container: "53"
-                      description:
-                        en_US: ""
-                      protocol: tcp
-                    - configurable: "no"
-                      container: "53"
-                      description:
-                        en_US: ""
-                      protocol: udp
-                    - configurable: "no"
-                      container: "3000"
-                      description:
-                        en_US: ""
-                      protocol: tcp
-                    - configurable: "no"
-                      container: "853"
-                      description:
-                        en_US: ""
-                      protocol: tcp
-                    - configurable: "no"
-                      container: "784"
-                      description:
-                        en_US: ""
-                      protocol: udp
-                shell: sh
-                volumes:
-                    - configurable: "no"
-                      container: /opt/adguardhome/work
-                      description:
-                        en_US: ""
-                    - configurable: "no"
-                      container: /opt/adguardhome/conf
-                      description:
-                        en_US: ""
+          - configurable: "no"
+            container: /opt/adguardhome/work
+            description:
+              en_US: ""
+          - configurable: "no"
+            container: /opt/adguardhome/conf
             description:
-                en_US: AdGuard Home is a network-wide software for blocking ads and tracking. After you set it up, it'll cover all your home devices, and you won't need any client-side software for that. Learn more on our official Github repository.
-            developer: AdguardTeam
-            icon: https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AdGuardHome/icon.png
-            screenshot_link:
-                - https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AdGuardHome/screenshot-1.png
-                - https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AdGuardHome/screenshot-2.png
-                - https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AdGuardHome/screenshot-3.png
-            tagline:
-                en_US: 'Network-wide ads & trackers blocking DNS server '
-            thumbnail: https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AdGuardHome/thumbnail.png
-            tips: {}
-            title:
-                en_US: AdGuard Home
+              en_US: ""
+      description:
+        en_US: AdGuard Home is a network-wide software for blocking ads and tracking. After you set it up, it'll cover all your home devices, and you won't need any client-side software for that. Learn more on our official Github repository.
+      developer: AdguardTeam
+      icon: https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AdGuardHome/icon.png
+      screenshot_link:
+        - https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AdGuardHome/screenshot-1.png
+        - https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AdGuardHome/screenshot-2.png
+        - https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AdGuardHome/screenshot-3.png
+      tagline:
+        en_US: 'Network-wide ads & trackers blocking DNS server '
+      thumbnail: https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AdGuardHome/thumbnail.png
+      tips: {}
+      title:
+        en_US: AdGuard Home
 x-casaos:
-    architectures:
-        - "386"
-        - amd64
-        - arm
-        - arm64
-        - ppc64le
-    main_app: adguard-home
+  architectures:
+    - "386"
+    - amd64
+    - arm
+    - arm64
+    - ppc64le
+  main_app: adguard-home
diff --git a/Apps/AllTubeDownload/docker-compose.yml b/Apps/AllTubeDownload/docker-compose.yml
@@ -1,42 +1,45 @@
 name: alltube-download
 services:
-    alltube-download:
-        image: rudloff/alltube:latest
-        mem_reservation: "67108864"
-        network_mode: bridge
+  alltube-download:
+    image: rudloff/alltube:latest
+    deploy:
+      resources:
+        reservations:
+          memory: 64M
+    network_mode: bridge
+    ports:
+      - target: 80
+        published: "80"
+        protocol: tcp
+    restart: always
+    x-casaos:
+      author: CasaOS Team
+      category: Utilities
+      container:
+        index: /
+        port_map: "80"
         ports:
-            - target: 80
-              published: "80"
-              protocol: tcp
-        restart: always
-        x-casaos:
-            author: CasaOS Team
-            category: Utilities
-            container:
-                index: /
-                port_map: "80"
-                ports:
-                    - configurable: "no"
-                      container: "80"
-                      description:
-                        en_US: ""
-                      protocol: tcp
-                shell: sh
+          - configurable: "no"
+            container: "80"
             description:
-                en_US: Easily download videos from YouTube, Dailymotion, Vimeo and other websites.
-            developer: Rudloff
-            icon: https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AllTubeDownload/icon.png
-            screenshot_link:
-                - https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AllTubeDownload/screenshot-1.png
-                - https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AllTubeDownload/screenshot-2.png
-                - https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AllTubeDownload/screenshot-3.png
-            tagline:
-                en_US: Web GUI for youtube-dl
-            thumbnail: https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AllTubeDownload/thumbnail.png
-            tips: {}
-            title:
-                en_US: AllTube Download
+              en_US: ""
+            protocol: tcp
+        shell: sh
+      description:
+        en_US: Easily download videos from YouTube, Dailymotion, Vimeo and other websites.
+      developer: Rudloff
+      icon: https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AllTubeDownload/icon.png
+      screenshot_link:
+        - https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AllTubeDownload/screenshot-1.png
+        - https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AllTubeDownload/screenshot-2.png
+        - https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AllTubeDownload/screenshot-3.png
+      tagline:
+        en_US: Web GUI for youtube-dl
+      thumbnail: https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/AllTubeDownload/thumbnail.png
+      tips: {}
+      title:
+        en_US: AllTube Download
 x-casaos:
-    architectures:
-        - amd64
-    main_app: alltube-download
+  architectures:
+    - amd64
+  main_app: alltube-download
diff --git a/Apps/Bazarr/docker-compose.yml b/Apps/Bazarr/docker-compose.yml
@@ -6,7 +6,10 @@ services:
       PUID: "1000"
       TZ: Europe/London
     image: linuxserver/bazarr:1.2.0
-    mem_reservation: "67108864"
+    deploy:
+      resources:
+        reservations:
+          memory: 64M
     network_mode: bridge
     ports:
       - target: 6767

diff --git a/Apps/Calibre-web/docker-compose.yml b/Apps/Calibre-web/docker-compose.yml
@@ -7,7 +7,10 @@ services:
       PUID: "1000"
       TZ: Europe/London
     image: linuxserver/calibre-web:0.6.19
-    mem_reservation: "67108864"
+    deploy:
+      resources:
+        reservations:
+          memory: 64M
     network_mode: bridge
     ports:
       - target: 8083

diff --git a/Apps/CouchPotato/docker-compose.yml b/Apps/CouchPotato/docker-compose.yml
@@ -6,7 +6,10 @@ services:
       PUID: "1000"
       TZ: $TZ
     image: linuxserver/couchpotato:version-7260c12f
-    mem_reservation: "67108864"
+    deploy:
+      resources:
+        reservations:
+          memory: 64M
     network_mode: bridge
     ports:
       - target: 5050

diff --git a/Apps/Deluge/docker-compose.yml b/Apps/Deluge/docker-compose.yml
@@ -7,7 +7,10 @@ services:
       PUID: $PUID
       TZ: $TZ
     image: linuxserver/deluge:2.1.1
-    mem_reservation: "268435456"
+    deploy:
+      resources:
+        reservations:
+          memory: 256M
     network_mode: bridge
     ports:
       - target: 8112

diff --git a/Apps/Duplicati/docker-compose.yml b/Apps/Duplicati/docker-compose.yml
@@ -6,7 +6,10 @@ services:
       PUID: "1000"
       TZ: Europe/London
     image: linuxserver/duplicati:2.0.6
-    mem_reservation: "67108864"
+    deploy:
+      resources:
+        reservations:
+          memory: 64M
     network_mode: bridge
     ports:
       - target: 8200