master - updates

ionghitun · Feb 11, 2024 · 083c336 · 083c336
1 parent 9516a38
commit 083c336
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.env.example b/.env.example
@@ -4,5 +4,5 @@ DOMAIN_HOST=portainer.local
 #email where you should receive lets encrypt renewal failures
 DOMAIN_EMAIL=email@email.com
 
-#what vhost file to use, edit contents to match domain above, example in docker/nginx/custom_dev.conf
-VHOST_FILE=custom_dev.conf
+#what vhost file to use, edit contents to match domain above, example in docker/nginx/custom.conf
+VHOST_FILE=custom.conf
diff --git a/data/.gitignore b/data/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.9'
 services:
     portainer-nginx:
         container_name: portainer-nginx
-        restart: always
+        restart: unless-stopped
         build:
             context: ./
             dockerfile: docker/nginx/Dockerfile
@@ -23,17 +23,14 @@ services:
 
     portainer-portainer:
         container_name: portainer-portainer
-        restart: always
         image: portainer/portainer-ce
+        restart: unless-stopped
         volumes:
-            - portainer_data:/data
+            - ./data:/data
             - /var/run/docker.sock:/var/run/docker.sock
         networks:
             - portainer
 
-volumes:
-    portainer_data:
-
 networks:
     portainer:
     nginx-proxy:

diff --git a/docker/nginx/custom_dev.conf → docker/nginx/custom.conf b/docker/nginx/custom_dev.conf → docker/nginx/custom.conf