Make changes for podman

mailcow · Jul 18, 2023 · 16e1180 · 16e1180
1 parent e691d2c
commit 16e1180
Showing 1 changed file with 24 additions and 28 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2.1'
 services:
 
     unbound-mailcow:
-      image: mailcow/unbound:1.17
+      image: docker.io/mailcow/unbound:1.17
       environment:
         - TZ=${TZ}
       volumes:
@@ -17,7 +17,7 @@ services:
             - unbound
 
     mysql-mailcow:
-      image: mariadb:10.5
+      image: docker.io/mariadb:10.5
       depends_on:
         - unbound-mailcow
       stop_grace_period: 45s
@@ -41,24 +41,22 @@ services:
             - mysql
 
     redis-mailcow:
-      image: redis:7-alpine
+      image: docker.io/redis:7-alpine
       volumes:
         - redis-vol-1:/data/
       restart: always
       ports:
         - "${REDIS_PORT:-127.0.0.1:7654}:6379"
       environment:
         - TZ=${TZ}
-      sysctls:
-        - net.core.somaxconn=4096
       networks:
         mailcow-network:
           ipv4_address: ${IPV4_NETWORK:-172.22.1}.249
           aliases:
             - redis
 
     clamd-mailcow:
-      image: mailcow/clamd:1.61
+      image: docker.io/mailcow/clamd:1.61
       restart: always
       depends_on:
         - unbound-mailcow
@@ -76,7 +74,7 @@ services:
             - clamd
 
     rspamd-mailcow:
-      image: mailcow/rspamd:1.92
+      image: docker.io/mailcow/rspamd:1.92
       stop_grace_period: 30s
       depends_on:
         - dovecot-mailcow
@@ -106,7 +104,7 @@ services:
             - rspamd
 
     php-fpm-mailcow:
-      image: mailcow/phpfpm:1.84
+      image: docker.io/mailcow/phpfpm:1.84
       command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
       depends_on:
         - redis-mailcow
@@ -169,7 +167,7 @@ services:
             - phpfpm
 
     sogo-mailcow:
-      image: mailcow/sogo:1.117
+      image: docker.io/mailcow/sogo:1.117
       environment:
         - DBNAME=${DBNAME}
         - DBUSER=${DBUSER}
@@ -216,7 +214,7 @@ services:
             - sogo
 
     dovecot-mailcow:
-      image: mailcow/dovecot:1.24
+      image: docker.io/mailcow/dovecot:1.24
       depends_on:
         - mysql-mailcow
       dns:
@@ -296,7 +294,7 @@ services:
             - dovecot
 
     postfix-mailcow:
-      image: mailcow/postfix:1.68
+      image: docker.io/mailcow/postfix:1.68
       depends_on:
         - mysql-mailcow
       volumes:
@@ -332,7 +330,7 @@ services:
             - postfix
 
     memcached-mailcow:
-      image: memcached:alpine
+      image: docker.io/memcached:alpine
       restart: always
       environment:
         - TZ=${TZ}
@@ -346,7 +344,7 @@ services:
         - sogo-mailcow
         - php-fpm-mailcow
         - redis-mailcow
-      image: nginx:mainline-alpine
+      image: docker.io/nginx:mainline-alpine
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
       command: /bin/sh -c "envsubst < /etc/nginx/conf.d/templates/listen_plain.template > /etc/nginx/conf.d/listen_plain.active &&
@@ -378,8 +376,8 @@ services:
         - ./data/conf/rspamd/meta_exporter:/meta_exporter:ro,z
         - sogo-web-vol-1:/usr/lib/GNUstep/SOGo/
       ports:
-        - "${HTTPS_BIND:-}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}"
-        - "${HTTP_BIND:-}:${HTTP_PORT:-80}:${HTTP_PORT:-80}"
+        - "${HTTPS_PORT:-443}:${HTTPS_PORT:-443}"
+        - "${HTTP_PORT:-80}:${HTTP_PORT:-80}"
       restart: always
       networks:
         mailcow-network:
@@ -389,7 +387,7 @@ services:
     acme-mailcow:
       depends_on:
         - nginx-mailcow
-      image: mailcow/acme:1.84
+      image: docker.io/mailcow/acme:1.84
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
       environment:
@@ -425,7 +423,7 @@ services:
             - acme
 
     netfilter-mailcow:
-      image: mailcow/netfilter:1.52
+      image: docker.io/mailcow/netfilter:1.52
       stop_grace_period: 30s
       depends_on:
         - dovecot-mailcow
@@ -448,7 +446,7 @@ services:
         - /lib/modules:/lib/modules:ro
 
     watchdog-mailcow:
-      image: mailcow/watchdog:1.97
+      image: docker.io/mailcow/watchdog:1.97
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
       tmpfs:
@@ -510,7 +508,7 @@ services:
             - watchdog
 
     dockerapi-mailcow:
-      image: mailcow/dockerapi:2.04
+      image: docker.io/mailcow/dockerapi:2.04
       security_opt:
         - label=disable
       restart: always
@@ -522,14 +520,14 @@ services:
         - REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
         - REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
       volumes:
-        - /var/run/docker.sock:/var/run/docker.sock:ro
+        - /run/user/1000/podman/podman.sock:/var/run/docker.sock:ro
       networks:
         mailcow-network:
           aliases:
             - dockerapi
 
     solr-mailcow:
-      image: mailcow/solr:1.8.1
+      image: docker.io/mailcow/solr:1.8.1
       restart: always
       volumes:
         - solr-vol-1:/opt/solr/server/solr/dovecot-fts/data
@@ -545,7 +543,7 @@ services:
             - solr
 
     olefy-mailcow:
-      image: mailcow/olefy:1.11
+      image: docker.io/mailcow/olefy:1.11
       restart: always
       environment:
         - TZ=${TZ}
@@ -563,7 +561,7 @@ services:
             - olefy
 
     ofelia-mailcow:
-      image: mcuadros/ofelia:latest
+      image: docker.io/mcuadros/ofelia:latest
       restart: always
       command: daemon --docker
       environment:
@@ -576,7 +574,7 @@ services:
       security_opt:
         - label=disable
       volumes:
-        - /var/run/docker.sock:/var/run/docker.sock:ro
+        - /run/user/1000/podman/podman.sock:/var/run/docker.sock:ro
       networks:
         mailcow-network:
           aliases:
@@ -602,21 +600,19 @@ services:
         - solr-mailcow
       environment:
         - TZ=${TZ}
-      image: robbertkl/ipv6nat
+      image: docker.io/robbertkl/ipv6nat
       security_opt:
         - label=disable
       restart: always
       privileged: true
       network_mode: "host"
       volumes:
-        - /var/run/docker.sock:/var/run/docker.sock:ro
+        - /run/user/1000/podman/podman.sock:/var/run/docker.sock:ro
         - /lib/modules:/lib/modules:ro
 
 networks:
   mailcow-network:
     driver: bridge
-    driver_opts:
-      com.docker.network.bridge.name: br-mailcow
     enable_ipv6: true
     ipam:
       driver: default