From 8083e2b51cfc2f280bea5fd5cab1e86d33f07d26 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Tue, 4 Feb 2025 23:48:18 +0100 Subject: [PATCH] optimized snipe-it draf --- roles/docker-snipe_it/README.md | 5 +++-- roles/docker-snipe_it/templates/docker-compose.yml.j2 | 8 +++----- roles/docker-snipe_it/templates/env.j2 | 6 ------ 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/roles/docker-snipe_it/README.md b/roles/docker-snipe_it/README.md index 423b0e31..bea4fbf4 100644 --- a/roles/docker-snipe_it/README.md +++ b/roles/docker-snipe_it/README.md @@ -1,4 +1,5 @@ ## more -https://github.com/snipe/snipe-it -https://snipeitapp.com/ \ No newline at end of file +- https://github.com/snipe/snipe-it +- https://snipeitapp.com/ +- https://snipe-it.readme.io/docs/ldap-sync-login \ No newline at end of file diff --git a/roles/docker-snipe_it/templates/docker-compose.yml.j2 b/roles/docker-snipe_it/templates/docker-compose.yml.j2 index 0a9f0650..1ba528fb 100644 --- a/roles/docker-snipe_it/templates/docker-compose.yml.j2 +++ b/roles/docker-snipe_it/templates/docker-compose.yml.j2 @@ -5,15 +5,13 @@ services: {% include 'roles/docker-central-database/templates/services/' + database_type + '.yml.j2' %} application: - image: snipe/snipe-it:${APP_VERSION} - restart: {{docker_restart_policy}} + image: snipe/snipe-it:{{applications.snipe_it.version}} +{% include 'roles/docker-compose/templates/services/base.yml.j2' %} volumes: - data:/var/lib/snipeit ports: - - "${APP_PORT}:80" + - "127.0.0.1:{{ports.localhost.http_ports.snipe_it}}:80" {% include 'templates/docker/container/depends-on-database-redis.yml.j2' %} - env_file: - - .env # Will also be read, without explicit declaring it here {% include 'templates/docker/container/networks.yml.j2' %} {% include 'templates/docker/compose/volumes.yml.j2' %} diff --git a/roles/docker-snipe_it/templates/env.j2 b/roles/docker-snipe_it/templates/env.j2 index abe7406e..92aa92e1 100644 --- a/roles/docker-snipe_it/templates/env.j2 +++ b/roles/docker-snipe_it/templates/env.j2 @@ -1,9 +1,3 @@ -# -------------------------------------------- -# REQUIRED: DOCKER SPECIFIC SETTINGS -# -------------------------------------------- -APP_VERSION={{applications.snipe_it.version}} -APP_PORT={{ports.localhost.http_ports.snipe_it}} - # -------------------------------------------- # REQUIRED: BASIC APP SETTINGS # --------------------------------------------