tipi/app-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(koillection): remove redundant "https enabled" env var

Browse Source
This commit is contained in:
Nicolas Meienberger 2023-11-13 08:11:29 +01:00
parent 9121195828
commit 4a74dcc624
2 changed files with 99 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
apps/koillection/config.json
View File

@ -1,36 +1,33 @@
{ {
"name": "Koillection", "$schema": "../schema.json",
"available": true, "name": "Koillection",
"port": 8050, "available": true,
"exposable": true, "port": 8050,
"id": "koillection", "exposable": true,
"description": "Koillection is a self-hosted service allowing users to manage any kind of collections.", "id": "koillection",
"tipi_version": 1, "description": "Koillection is a self-hosted service allowing users to manage any kind of collections.",
"version": "1.4.11", "tipi_version": 1,
"categories": ["utilities"], "version": "1.4.11",
"short_desc": "Koillection allow you to manage any kind of collections.", "categories": ["utilities"],
"author": "https://github.com/benjaminjonard", "short_desc": "Koillection allow you to manage any kind of collections.",
"source": "https://github.com/benjaminjonard/koillection", "author": "https://github.com/benjaminjonard",
"website": "https://koillection.github.io/", "source": "https://github.com/benjaminjonard/koillection",
"form_fields": [ "website": "https://koillection.github.io/",
{ "supported_architectures": ["amd64", "arm64"],
"type": "boolean", "form_fields": [
"label": "https enable", {
"env_variable": "KOILLECTION_HTTPS_ENABLED" "type": "random",
}, "label": "database user",
{ "min": 15,
"type": "random", "max": 15,
"label": "database user", "env_variable": "KOILLECTION_DB_USER"
"min": 15, },
"max": 15, {
"env_variable": "KOILLECTION_DB_USER" "type": "random",
}, "label": "database password",
{ "min": 30,
"type": "random", "max": 30,
"label": "database password", "env_variable": "KOILLECTION_DB_PASSWORD"
"min": 30, }
"max": 30, ]
"env_variable": "KOILLECTION_DB_PASSWORD" }
}
]
}

134
apps/koillection/docker-compose.yml
View File

@ -1,71 +1,71 @@
version: '3' version: '3'
services: services:
koillection: koillection:
image: koillection/koillection:1.4.11 image: koillection/koillection:1.4.11
container_name: koillection container_name: koillection
restart: unless-stopped restart: unless-stopped
ports: ports:
- ${APP_PORT}:80 - ${APP_PORT}:80
depends_on: depends_on:
- koillection-db - koillection-db
volumes: volumes:
- ${APP_DATA_DIR}/data/uploads:/uploads - ${APP_DATA_DIR}/data/uploads:/uploads
environment: environment:
- APP_DEBUG=0 - APP_DEBUG=0
- APP_ENV=prod - APP_ENV=prod
- HTTPS_ENABLED={KOILLECTION_HTTPS_ENABLED} - HTTPS_ENABLED={APP_EXPOSED}
- UPLOAD_MAX_FILESIZE=20M - UPLOAD_MAX_FILESIZE=20M
- PHP_MEMORY_LIMIT=512M - PHP_MEMORY_LIMIT=512M
- PHP_TZ=${TZ} - PHP_TZ=${TZ}
- CORS_ALLOW_ORIGIN=* - CORS_ALLOW_ORIGIN=*
- JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem - JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
- JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem - JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
- DB_DRIVER=pdo_pgsql - DB_DRIVER=pdo_pgsql
- DB_NAME=koillection - DB_NAME=koillection
- DB_HOST=koillection-db - DB_HOST=koillection-db
- DB_PORT=5432 - DB_PORT=5432
- DB_USER={KOILLECTION_DB_USER} - DB_USER={KOILLECTION_DB_USER}
- DB_PASSWORD={KOILLECTION_DB_PASSWORD} - DB_PASSWORD={KOILLECTION_DB_PASSWORD}
- DB_VERSION=15 - DB_VERSION=15
networks: networks:
- tipi_main_network - tipi_main_network
labels: labels:
# Main # Main
traefik.enable: true traefik.enable: true
traefik.http.middlewares.koillection-web-redirect.redirectscheme.scheme: https traefik.http.middlewares.koillection-web-redirect.redirectscheme.scheme: https
traefik.http.services.koillection.loadbalancer.server.port: 8080 traefik.http.services.koillection.loadbalancer.server.port: 8080
# Web # Web
traefik.http.routers.koillection-insecure.rule: Host(`${APP_DOMAIN}`) traefik.http.routers.koillection-insecure.rule: Host(`${APP_DOMAIN}`)
traefik.http.routers.koillection-insecure.entrypoints: web traefik.http.routers.koillection-insecure.entrypoints: web
traefik.http.routers.koillection-insecure.service: koillection traefik.http.routers.koillection-insecure.service: koillection
traefik.http.routers.koillection-insecure.middlewares: koillection-web-redirect traefik.http.routers.koillection-insecure.middlewares: koillection-web-redirect
# Websecure # Websecure
traefik.http.routers.koillection.rule: Host(`${APP_DOMAIN}`) traefik.http.routers.koillection.rule: Host(`${APP_DOMAIN}`)
traefik.http.routers.koillection.entrypoints: websecure traefik.http.routers.koillection.entrypoints: websecure
traefik.http.routers.koillection.service: koillection traefik.http.routers.koillection.service: koillection
traefik.http.routers.koillection.tls.certresolver: myresolver traefik.http.routers.koillection.tls.certresolver: myresolver
# Local domain # Local domain
traefik.http.routers.koillection-local-insecure.rule: Host(`koillection.${LOCAL_DOMAIN}`) traefik.http.routers.koillection-local-insecure.rule: Host(`koillection.${LOCAL_DOMAIN}`)
traefik.http.routers.koillection-local-insecure.entrypoints: web traefik.http.routers.koillection-local-insecure.entrypoints: web
traefik.http.routers.koillection-local-insecure.service: koillection traefik.http.routers.koillection-local-insecure.service: koillection
traefik.http.routers.koillection-local-insecure.middlewares: koillection-web-redirect traefik.http.routers.koillection-local-insecure.middlewares: koillection-web-redirect
# Local domain secure # Local domain secure
traefik.http.routers.koillection-local.rule: Host(`koillection.${LOCAL_DOMAIN}`) traefik.http.routers.koillection-local.rule: Host(`koillection.${LOCAL_DOMAIN}`)
traefik.http.routers.koillection-local.entrypoints: websecure traefik.http.routers.koillection-local.entrypoints: websecure
traefik.http.routers.koillection-local.service: koillection traefik.http.routers.koillection-local.service: koillection
traefik.http.routers.koillection-local.tls: true traefik.http.routers.koillection-local.tls: true
koillection-db: koillection-db:
image: postgres:15 image: postgres:15
container_name: koillection-db container_name: koillection-db
restart: unless-stopped restart: unless-stopped
environment: environment:
- POSTGRES_DB=koillection - POSTGRES_DB=koillection
- POSTGRES_USER={KOILLECTION_DB_USER} - POSTGRES_USER={KOILLECTION_DB_USER}
- POSTGRES_PASSWORD={KOILLECTION_DB_PASSWORD} - POSTGRES_PASSWORD={KOILLECTION_DB_PASSWORD}
volumes: volumes:
- ${APP_DATA_DIR}/data/volumes/postgresql:/var/lib/postgresql/data - ${APP_DATA_DIR}/data/volumes/postgresql:/var/lib/postgresql/data
networks: networks:
- tipi_main_network - tipi_main_network