portainer

fullupgrade
update nginx
2023-03-30 11:34:17 +02:00 · 2023-03-30 11:07:15 +02:00 · 2023-03-29 17:52:59 +02:00 · 2023-03-29 17:51:59 +02:00 · 2023-03-29 17:50:51 +02:00 · 2023-03-29 17:50:29 +02:00
7 changed files with 153 additions and 21 deletions
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -24,7 +24,7 @@ services:
      - NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD}
      - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER}
      - NEXTCLOUD_TRUSTED_DOMAINS=${APP_HOST}
-      - TRUSTED_PROXIES=${TRUSTED_PROXIES}
+      - TRUSTED_PROXIES=172.16.0.0/16
      - OVERWRITECLIURL=https://${APP_HOST}
      - OVERWRITEHOST=${APP_HOST}
      - OVERWRITEPROTOCOL=https
@@ -47,7 +47,6 @@ services:
      - traefik.docker.network=traefik_web
      - traefik.http.routers.${ROUTER_NAME}-router.entrypoints=${ENTRYPOINT}
      - traefik.http.routers.${ROUTER_NAME}-router.rule=Host(`${APP_HOST}`)
-      - traefik.http.routers.${ROUTER_NAME}-router.tls=true
    networks:
      - default
      - traefik_web
@@ -78,4 +77,9 @@ volumes:
  nextcloud_data:
  nextcloud_config:
  nextcloud_custom_apps:
-  
+  
+
+# Specific for traefik
+networks:
+  traefik_web:
+    external: true
--- a/nginx-webserver/.env
+++ b/nginx-webserver/.env
@@ -0,0 +1,6 @@
+MYSQL_DATABASE=wordpress
+MYSQL_ROOT_PASSWORD=wordpress
+MYSQL_USER=wordpress
+MYSQL_PASSWORD=wordpress
+APP_HOST=wordpress.traefik.me
+ROUTER_NAME=wordpress
--- a/nginx-webserver/docker-compose.yml
+++ b/nginx-webserver/docker-compose.yml
@@ -0,0 +1,24 @@
+version: '3.7'
+services:
+  nginx:
+    image: nginx:latest
+    restart: always
+
+    networks:
+      - traefik_web
+      - default
+    labels:                 
+      - traefik.enable=true      
+      - traefik.docker.network=traefik_web
+      - traefik.http.routers.${ROUTER_NAME}-router.entrypoints=${ENTRYPOINT}
+      - traefik.http.routers.${ROUTER_NAME}-router.rule=Host(`${APP_HOST}`)
+    volumes:
+      - nginx-html:/usr/share/nginx/html
+      - nginx-conf:/etc/nginx
+
+volumes:
+  nginx-html:
+  nginx-conf:
+networks:
+  traefik_web:
+    external: true
--- a/piwigo/docker-compose.yml
+++ b/piwigo/docker-compose.yml
@@ -14,7 +14,6 @@ services:
    - traefik.docker.network=traefik_web
    - traefik.http.routers.${ROUTER_NAME}-router.entrypoints=${ENTRYPOINT}
    - traefik.http.routers.${ROUTER_NAME}-router.rule=Host(`${APP_HOST}`)
-    - traefik.http.routers.${ROUTER_NAME}-router.tls=true
    networks:
      - default
      - traefik_web
--- a/portainer.json
+++ b/portainer.json
@@ -93,7 +93,7 @@
                "value": "web"
              },
              {
-                "text": "Https et Httpw",
+                "text": "Https et http",
                "value": "web,websecure",
                "default": true

@@ -127,7 +127,7 @@
          },
          {
            "name": "ROUTER_NAME",
-            "label": "router host",
+            "label": "Nom du routeur Traefik(doit être unique)",
            "description": "Nom du routeur",
            "default": "redmine"
          },
@@ -189,7 +189,7 @@
          },
          {
            "name": "ROUTER_NAME",
-            "label": "router host",
+            "label": "Nom du routeur Traefik(doit être unique)",
            "description": "Nom du routeur",
            "default": "piwigo"
          },
@@ -205,9 +205,9 @@
        "type": 3,
        "title": "Nextcloud",
        "description": "Installation de Nextclcoud en mode docker compose",
-        "categories": ["MediaManagement"],
+        "categories": ["Cloud"],
        "platform": "linux",
-        "logo": "https://upload.wikimedia.org/wikipedia/fr/thumb/2/2e/Piwigo-logo-black-letters.svg/800px-Piwigo-logo-black-letters.svg.png",
+        "logo": "https://upload.wikimedia.org/wikipedia/commons/thumb/6/60/Nextcloud_Logo.svg/141px-Nextcloud_Logo.svg.png",
        "repository": {
          "url": "https://git.baraise.fr/Aguay/portainer",
          "stackfile": "nextcloud/docker-compose.yml"
@@ -227,12 +227,12 @@
                "value": "web"
              },
              {
-                "text": "Https et Httpw",
+                "text": "Https et http",
                "value": "web,websecure",
                "default": true

              }
-            ],
+            ]
          },
          {
            "name": "NEXTCLOUD_VERSION",
@@ -240,6 +240,12 @@
            "description": "Version de nextcloud  (latest si vide, list https://hub.docker.com/_/nextcloud/tags)",
            "default": "latest"
          },
+          {
+            "name": "MARIADB_VERSION",
+            "label": "Mariadb version",
+            "description": "Version de mariadb  (10.5 si vide, check requirements: https://piwigo.org/guides/install/requirements)",
+            "default": "10.5" 
+          },
          {
            "name": "NEXTCLOUD_ADMIN_USER",
            "label": "Username admin",
@@ -254,7 +260,7 @@
            "name": "MYSQL_DATABASE",
            "label": "Mysql Database",
            "description": "Version of Dokku to use ('latest' if empty)",
-            "default": "piwigo_db"
+            "default": "nextcloud_db"
          },
          {
            "name": "MYSQL_ROOT_PASSWORD",
@@ -266,25 +272,25 @@
            "name": "MYSQL_USER",
            "label": "Mysql user",
            "description": "Host path to be bound to /mnt/dokku (`/var/lib/dokku` if empty)",
-            "default": "piwigo_user"
+            "default": "nextcloud_user"
          },
          {
            "name": "MYSQL_PASSWORD",
            "label": "Mysql password",
            "description": "Image build cache path. Generally set to <data dir> + '/home/dokku'",
-            "default": "P1w1g0PassDB"
+            "default": "N3xtcloud0PassDB"
          },
          {
            "name": "ROUTER_NAME",
-            "label": "router host",
+            "label": "Nom du routeur Traefik(doit être unique)",
            "description": "Nom du routeur",
-            "default": "piwigo"
+            "default": "nextcloud"
          },
          {
            "name": "APP_HOST",
            "label": "Url app host",
            "description": "Nom de domaine pour l'accès à l'application",
-            "default": "piwigo.traefik.me"
+            "default": "nextcloud.traefik.me"
          },
          {
            "name": "SMTP_HOST",
@@ -332,6 +338,101 @@
            "description": "Exemple: pour support@domain.fr mettre \"support\"."
          }
        ]
+      },
+      {
+        "type": 3,
+        "title": "Nginx",
+        "description": "WebServer",
+        "categories": ["web"],
+        "platform": "linux",
+        "logo": "https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/512px-Nginx_logo.svg.png",
+        "repository": {
+          "url": "https://git.baraise.fr/Aguay/portainer",
+          "stackfile": "nginx-webserver/docker-compose.yml"
+        },
+        "note": "Web server nginx pour avoir des assets statics à disposition.",
+        "env": [
+          {
+            "name": "ENTRYPOINT",
+            "label": "Entrypoint pour le http et le https",
+            "description": "entrypoint traefik",
+            "select": [
+              {
+                "text": "Voulez vous du https uniquement?",
+                "value": "websecure"
+              },
+              {
+                "text": "Que du htttp?",
+                "value": "web"
+              },
+              {
+                "text": "Https et http",
+                "value": "web,websecure",
+                "default": true
+
+              }
+            ]
+          },
+          
+          {
+            "name": "ROUTER_NAME",
+            "label": "Nom du routeur Traefik(doit être unique)",
+            "description": "Nom du routeur pour affichage dans le dashboard traefik",
+            "default": "web-server"
+          },
+          {
+            "name": "APP_HOST",
+            "label": "Url de l'application ",
+            "description": "Nom de domaine pour l'accès à l'application attention à être sur la bonne plateforme.",
+            "default": "web.traefik.me"
+          }
+        ]
+      },
+      {
+        "type": 1,
+        "title": "FilePicker",
+        "description": "File brower pour Nginx par exemple",
+        "categories": ["web"],
+        "platform": "linux",
+        "logo": "https://www.gitbook.com/cdn-cgi/image/width=40,dpr=2,height=40,fit=contain,format=auto/https%3A%2F%2F3149836655-files.gitbook.io%2F~%2Ffiles%2Fv0%2Fb%2Fgitbook-legacy-files%2Fo%2Fspaces%252F-M8KDxOujDoPpJyJJ5_i%252Favatar-1590579241040.png",
+        "image": "filebrowser/filebrowser",
+        "note": "Web server nginx pour avoir des assets statics à disposition.",
+        "env": [
+          {
+            "name": "ENTRYPOINT",
+            "label": "Entrypoint pour le http et le https",
+            "description": "entrypoint traefik",
+            "select": [
+              {
+                "text": "Voulez vous du https uniquement?",
+                "value": "websecure"
+              },
+              {
+                "text": "Que du htttp?",
+                "value": "web"
+              },
+              {
+                "text": "Https et http",
+                "value": "web,websecure",
+                "default": true
+
+              }
+            ]
+          },
+          
+          {
+            "name": "ROUTER_NAME",
+            "label": "Nom du routeur Traefik(doit être unique)",
+            "description": "Nom du routeur pour affichage dans le dashboard traefik",
+            "default": "web-server"
+          },
+          {
+            "name": "APP_HOST",
+            "label": "Url de l'application ",
+            "description": "Nom de domaine pour l'accès à l'application attention à être sur la bonne plateforme.",
+            "default": "web.traefik.me"
+          }
+        ]
      }
    ]
  }
--- a/redmine/docker-compose.yml
+++ b/redmine/docker-compose.yml
@@ -18,7 +18,6 @@ services:
      - traefik.docker.network=traefik_web
      - traefik.http.routers.${ROUTER_NAME}-router.entrypoints=${ENTRYPOINT}
      - traefik.http.routers.${ROUTER_NAME}-router.rule=Host(`${APP_HOST}`)
-      - traefik.http.routers.${ROUTER_NAME}-router.tls=true
  db:
    image: mariadb:${MARIADB_VERSION}
    restart: always
--- a/wordpress/docker-compose.yml
+++ b/wordpress/docker-compose.yml
@@ -28,9 +28,8 @@ services:
    labels:                 
      - traefik.enable=true      
      - traefik.docker.network=traefik_web
-      - traefik.http.routers.${APP_HOST//./-}-router.entrypoints=${ENTRYPOINT}
-      - traefik.http.routers.${APP_HOST//./-}-router.rule=Host(`${APP_HOST}`)
-      - traefik.http.routers.${APP_HOST//./-}-router.tls=true
+      - traefik.http.routers.${ROUTER_NAME}-router.entrypoints=${ENTRYPOINT}
+      - traefik.http.routers.${ROUTER_NAME}-router.rule=Host(`${APP_HOST}`)
 volumes:
  db_data:
Author	SHA1	Message	Date
valentin	71a7d2c3e3	portainer	2023-03-30 11:34:17 +02:00
valentin	1ec5425657	fullupgrade	2023-03-30 11:07:15 +02:00
valentin	32f3b58cb1	update nginx	2023-03-29 17:52:59 +02:00
valentin	937360bcbf	volume	2023-03-29 17:51:59 +02:00
valentin	d5a3bb0c58	update ngnix	2023-03-29 17:50:51 +02:00
valentin	7c531ff634	update nginx	2023-03-29 17:50:29 +02:00
valentin	0e64080ed5	fix wordpress router name	2023-03-29 17:39:31 +02:00
valentin	1c817164d2	add nginx	2023-03-29 17:39:20 +02:00
valentin	ece89864d0	nextcloud network	2023-03-22 17:47:53 +01:00
valentin	a7ad278a02	nexcloud	2023-03-22 17:46:32 +01:00
valentin	18b4f80d06	nextcloud logo	2023-03-22 17:44:19 +01:00
valentin	a42a9915b7	nextcloud	2023-03-22 17:43:36 +01:00
valentin	7430228fe4	nextcloud	2023-03-22 17:43:08 +01:00