Merge branch 'azlekov-invoice-ninja/fix-broken-compose'

apps/invoice-ninja/config.json

@@ -5,7 +5,7 @@
   "available": true,
   "exposable": true,
   "id": "invoice-ninja",
-  "tipi_version": 1,
+  "tipi_version": 2,
   "version": "5.8.54",
   "categories": ["finance"],
   "description": "Invoice Ninja is an invoicing application which makes sending invoices and receiving payments simple and easy. Our latest version is a clean slate rewrite of our popular invoicing application which builds on the existing feature set and adds a wide range of features and enhancements the community has asked for.",
@@ -38,8 +38,5 @@
       "env_variable": "INVOICE_NINJA_APP_KEY"
     }
   ],
-  "supported_architectures": [
-    "arm64",
-    "amd64"
-  ]
+  "supported_architectures": ["arm64", "amd64"]
 }

apps/invoice-ninja/data/nginx/invoice-ninja.conf

@@ -25,7 +25,7 @@ server {
 
     location ~ \.php$ {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass invoice-ninja-server:9000;
+        fastcgi_pass invoice-ninja:9000;
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

apps/invoice-ninja/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   invoice-ninja:
     image: invoiceninja/invoiceninja:5.8.54
@@ -9,7 +7,7 @@ services:
     environment:
       - IN_USER_EMAIL=${INVOICE_NINJA_USER_MAIL}
       - IN_PASSWORD=${INVOICE_NINJA_USER_PASSWORD}
-      - APP_URL=http://invoice-ninja
+      - APP_URL=http://invoice-ninja-web
       - APP_KEY=${INVOICE_NINJA_APP_KEY}
       - APP_CIPHER=AES-256-CBC
       - DB_HOST=invoice-ninja-db
@@ -39,7 +37,7 @@ services:
       - ${APP_DATA_DIR}/data/nginx/invoice-ninja.conf:/etc/nginx/conf.d/default.conf:ro
       - ${APP_DATA_DIR}/data/public:/var/www/app/public:ro
     depends_on:
-      invoice-ninja-server:
+      invoice-ninja:
         condition: service_started
     ports:
       - ${APP_PORT}:80
@@ -51,25 +49,25 @@ services:
       traefik.http.middlewares.invoice-ninja-web-redirect.redirectscheme.scheme: https
       traefik.http.services.invoice-ninja.loadbalancer.server.port: 80
       # Web
-      traefik.http.routers.invoice-ninja-insecure.rule: Host(`${APP_DOMAIN}`)
-      traefik.http.routers.invoice-ninja-insecure.entrypoints: web
-      traefik.http.routers.invoice-ninja-insecure.service: invoice-ninja
-      traefik.http.routers.invoice-ninja-insecure.middlewares: invoice-ninja-web-redirect
+      traefik.http.routers.invoice-ninja-web-insecure.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.invoice-ninja-web-insecure.entrypoints: web
+      traefik.http.routers.invoice-ninja-web-insecure.service: invoice-ninja-web
+      traefik.http.routers.invoice-ninja-web-insecure.middlewares: invoice-ninja-web-redirect
       # Websecure
-      traefik.http.routers.invoice-ninja.rule: Host(`${APP_DOMAIN}`)
-      traefik.http.routers.invoice-ninja.entrypoints: websecure
-      traefik.http.routers.invoice-ninja.service: invoice-ninja
-      traefik.http.routers.invoice-ninja.tls.certresolver: myresolver
+      traefik.http.routers.invoice-ninja-web.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.invoice-ninja-web.entrypoints: websecure
+      traefik.http.routers.invoice-ninja-web.service: invoice-ninja-web
+      traefik.http.routers.invoice-ninja-web.tls.certresolver: myresolver
       # Local domain
-      traefik.http.routers.invoice-ninja-local-insecure.rule: Host(`invoice-ninja.${LOCAL_DOMAIN}`)
-      traefik.http.routers.invoice-ninja-local-insecure.entrypoints: web
-      traefik.http.routers.invoice-ninja-local-insecure.service: invoice-ninja
-      traefik.http.routers.invoice-ninja-local-insecure.middlewares: invoice-ninja-web-redirect
+      traefik.http.routers.invoice-ninja-web-local-insecure.rule: Host(`invoice-ninja.${LOCAL_DOMAIN}`)
+      traefik.http.routers.invoice-ninja-web-local-insecure.entrypoints: web
+      traefik.http.routers.invoice-ninja-web-local-insecure.service: invoice-ninja-web
+      traefik.http.routers.invoice-ninja-web-local-insecure.middlewares: invoice-ninja-web-redirect
       # Local domain secure
-      traefik.http.routers.invoice-ninja-local.rule: Host(`invoice-ninja.${LOCAL_DOMAIN}`)
-      traefik.http.routers.invoice-ninja-local.entrypoints: websecure
-      traefik.http.routers.invoice-ninja-local.service: invoice-ninja
-      traefik.http.routers.invoice-ninja-local.tls: true
+      traefik.http.routers.invoice-ninja-web-local.rule: Host(`invoice-ninja.${LOCAL_DOMAIN}`)
+      traefik.http.routers.invoice-ninja-web-local.entrypoints: websecure
+      traefik.http.routers.invoice-ninja-web-local.service: invoice-ninja-web
+      traefik.http.routers.invoice-ninja-web-local.tls: true
 
   invoice-ninja-db:
     image: mariadb:10.4
@@ -88,14 +86,7 @@ services:
       invoice-ninja-init:
         condition: service_completed_successfully
     healthcheck:
-      test:
-        [
-          "CMD",
-          "healthcheck.sh",
-          "--su-mysql",
-          "--connect",
-          "--innodb_initialized",
-        ]
+      test: ['CMD', 'healthcheck.sh', '--su-mysql', '--connect', '--innodb_initialized']
       interval: 10s
       timeout: 5s
       retries: 5