Merge remote changes and resolve conflicts

docker-compose.yml

@@ -13,13 +13,11 @@ services:
     volumes:
       - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
       - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro
-      - certbot-etc:/etc/letsencrypt
-      - certbot-var:/var/lib/letsencrypt
+      - certbot-etc:/etc/letsencrypt:ro
+      - certbot-var:/var/lib/letsencrypt:ro
       - webroot:/var/www/html
     depends_on:
       - backend
-    networks:
-      - app-network
 
   backend:
     build:
@@ -33,25 +31,15 @@ services:
     volumes:
       - ./backend:/app
       - sqlite_data:/app/instance
-    networks:
-      - app-network
 
   certbot:
-    image: certbot/certbot:latest
+    image: certbot/certbot
     container_name: certbot
     volumes:
       - certbot-etc:/etc/letsencrypt
       - certbot-var:/var/lib/letsencrypt
       - webroot:/var/www/html
-    depends_on:
-      - frontend
-    networks:
-      - app-network
-    entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
-
-networks:
-  app-network:
-    driver: bridge
+    command: certonly --webroot --webroot-path=/var/www/html --email admin@itformhelp.ru --agree-tos --no-eff-email --force-renewal -d itformhelp.ru -d www.itformhelp.ru
 
 volumes:
   sqlite_data: