Optimized snipe-it role draft

roles/docker-snipe-it/templates/docker-compose.yml

@@ -1,18 +0,0 @@
-volumes:
-  db_data:
-  storage:
-
-services:
-  app:
-    image: snipe/snipe-it:${APP_VERSION}
-    restart: unless-stopped
-    volumes:
-      - storage:/var/lib/snipeit
-    ports:
-      - "${APP_PORT:-8000}:80"
-    depends_on:
-      db:
-        condition: service_healthy
-        restart: true
-    env_file:
-      - .env

roles/docker-snipe-it/templates/docker-compose.yml.j2

@@ -0,0 +1,26 @@
+volumes:
+  db_data:
+  storage:
+
+{% include 'templates/docker/services/redis.yml.j2' %}
+
+{% include 'templates/docker/services/' + database_type + '.yml.j2' %}
+
+services:
+  app:
+    image: snipe/snipe-it:${APP_VERSION}
+    restart: {{docker_restart_policy}}
+    volumes:
+      - data:/var/lib/snipeit
+    ports:
+      - "${APP_PORT}:80"
+{% include 'templates/docker/container/depends-on-database-redis.yml.j2' %}
+    env_file:
+      - .env  # Will also be read, without this parameter
+{% include 'templates/docker/container/networks.yml.j2' %}
+
+{% include 'templates/docker/compose/volumes.yml.j2' %}
+  redis:
+  data:
+
+{% include 'templates/docker/compose/networks.yml.j2' %}

roles/docker-snipe-it/templates/env.j2

@@ -1,8 +1,8 @@
 # --------------------------------------------
 # REQUIRED: DOCKER SPECIFIC SETTINGS
 # --------------------------------------------
-APP_VERSION=
+APP_VERSION={{applications.snape-it.version}}
-APP_PORT=8000
+APP_PORT={{ports.localhost.http_ports.snipe-it}}
 
 # --------------------------------------------
 # REQUIRED: BASIC APP SETTINGS
@@ -11,10 +11,10 @@ APP_ENV=production
 APP_DEBUG=false
 # Please regenerate the APP_KEY value by calling `docker compose run --rm app php artisan key:generate --show`. Copy paste the value here
 APP_KEY=base64:3ilviXqB9u6DX1NRcyWGJ+sjySF+H18CPDGb3+IVwMQ=
-APP_URL=http://localhost:8000
+APP_URL=https://{{domain}}
 # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones - TZ identifier
-APP_TIMEZONE='UTC'
+APP_TIMEZONE='{{timezone}}'
-APP_LOCALE=en-US
+APP_LOCALE={{locale}}
 MAX_RESULTS=500
 
 # --------------------------------------------
@@ -27,16 +27,16 @@ PUBLIC_FILESYSTEM_DISK=local_public
 # REQUIRED: DATABASE SETTINGS
 # --------------------------------------------
 DB_CONNECTION=mysql
-DB_HOST=db
+DB_HOST={{database_host}}
-DB_PORT='3306'
+DB_PORT={{database_port}}
-DB_DATABASE=snipeit
+DB_DATABASE={{database_name}}
-DB_USERNAME=snipeit
+DB_USERNAME={{database_username}}
-DB_PASSWORD=changeme1234
+DB_PASSWORD={{pixelfed_database_password}}
-MYSQL_ROOT_PASSWORD=changeme1234
+#MYSQL_ROOT_PASSWORD=
-DB_PREFIX=null
+#DB_PREFIX=null
-DB_DUMP_PATH='/usr/bin'
+#DB_DUMP_PATH='/usr/bin'
-DB_CHARSET=utf8mb4
+#DB_CHARSET=utf8mb4
-DB_COLLATION=utf8mb4_unicode_ci
+#DB_COLLATION=utf8mb4_unicode_ci
 
 # --------------------------------------------
 # OPTIONAL: SSL DATABASE SETTINGS
@@ -52,17 +52,17 @@ DB_SSL_VERIFY_SERVER=null
 # --------------------------------------------
 # REQUIRED: OUTGOING MAIL SERVER SETTINGS
 # --------------------------------------------
-MAIL_MAILER=smtp
+MAIL_MAILER             =   smtp
-MAIL_HOST=mailhog
+MAIL_HOST               =   {{system_email.host}}                                       # SMTP server address
-MAIL_PORT=1025
+MAIL_PORT               =   {{system_email.host}}                                       # SMTP server address
-MAIL_USERNAME=null
+MAIL_USERNAME           =   {{system_email.username}}                                   # user to connect the SMTP server
-MAIL_PASSWORD=null
+MAIL_PASSWORD           =   {{system_email.password}}                                   # SMTP user's password
-MAIL_TLS_VERIFY_PEER=true
+MAIL_TLS_VERIFY_PEER    =   EMAIL_USE_TLS={{ system_email.tls | lower | capitalize }}   # use TLS (secure) connection with the SMTP server
-MAIL_FROM_ADDR=you@example.com
+MAIL_FROM_ADDR          =   {{system_email.from}}                                       # default email address for the automated emails
-MAIL_FROM_NAME='Snipe-IT'
+MAIL_FROM_NAME          =   'Snipe-IT'
-MAIL_REPLYTO_ADDR=you@example.com
+MAIL_REPLYTO_ADDR       =   {{system_email.from}}                                       # default email address for the automated emails
-MAIL_REPLYTO_NAME='Snipe-IT'
+MAIL_REPLYTO_NAME       =   'Snipe-IT'
-MAIL_AUTO_EMBED_METHOD='attachment'
+MAIL_AUTO_EMBED_METHOD  =   'attachment'
 
 # --------------------------------------------
 # REQUIRED: DATA PROTECTION
@@ -97,12 +97,12 @@ API_TOKEN_EXPIRATION_YEARS=40
 # --------------------------------------------
 # OPTIONAL: SECURITY HEADER SETTINGS
 # --------------------------------------------
-APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1,172.16.0.0/12
+APP_TRUSTED_PROXIES=172.17.0.1  # Docker Gateway
 ALLOW_IFRAMING=false
 REFERRER_POLICY=same-origin
-ENABLE_CSP=false
+ENABLE_CSP=true
 CORS_ALLOWED_ORIGINS=null
-ENABLE_HSTS=false
+ENABLE_HSTS=false               # Certificates managed by nginx
 
 # --------------------------------------------
 # OPTIONAL: CACHE SETTINGS
@@ -115,7 +115,7 @@ CACHE_PREFIX=snipeit
 # --------------------------------------------
 # OPTIONAL: REDIS SETTINGS
 # --------------------------------------------
-REDIS_HOST=null
+REDIS_HOST=redis
 REDIS_PASSWORD=null
 REDIS_PORT=6379