Merge branch 'runtipi:master' into flaresolverr
This commit is contained in:
commit
cbf7f99066
|
|
@ -5,14 +5,12 @@
|
||||||
"exposable": true,
|
"exposable": true,
|
||||||
"port": 8119,
|
"port": 8119,
|
||||||
"id": "bookstack",
|
"id": "bookstack",
|
||||||
"tipi_version": 20,
|
"tipi_version": 21,
|
||||||
"version": "24.05.20240513",
|
"version": "24.05.20240520",
|
||||||
"description": "BookStack is a simple, self-hosted, easy-to-use platform for organising and storing information. Default login: admin@admin.com password: password",
|
"description": "BookStack is a simple, self-hosted, easy-to-use platform for organising and storing information. Default login: admin@admin.com password: password",
|
||||||
"short_desc": "BookStack is a self-hosted platform for organising and storing information.",
|
"short_desc": "BookStack is a self-hosted platform for organising and storing information.",
|
||||||
"author": "Dan Brown",
|
"author": "Dan Brown",
|
||||||
"categories": [
|
"categories": ["data"],
|
||||||
"data"
|
|
||||||
],
|
|
||||||
"website": "https://www.bookstackapp.com/",
|
"website": "https://www.bookstackapp.com/",
|
||||||
"source": "https://github.com/BookStackApp/BookStack",
|
"source": "https://github.com/BookStackApp/BookStack",
|
||||||
"form_fields": [
|
"form_fields": [
|
||||||
|
|
@ -25,8 +23,5 @@
|
||||||
"env_variable": "BOOKSTACK_DB_PASS"
|
"env_variable": "BOOKSTACK_DB_PASS"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"supported_architectures": [
|
"supported_architectures": ["arm64", "amd64"]
|
||||||
"arm64",
|
|
||||||
"amd64"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
version: "3.7"
|
version: "3.7"
|
||||||
services:
|
services:
|
||||||
bookstack:
|
bookstack:
|
||||||
image: lscr.io/linuxserver/bookstack:24.05.20240513
|
image: lscr.io/linuxserver/bookstack:24.05.20240520
|
||||||
container_name: bookstack
|
container_name: bookstack
|
||||||
environment:
|
environment:
|
||||||
- APP_URL=${APP_PROTOCOL:-http}://${APP_DOMAIN}
|
- APP_URL=${APP_PROTOCOL:-http}://${APP_DOMAIN}
|
||||||
|
|
|
||||||
|
|
@ -6,18 +6,13 @@
|
||||||
"exposable": true,
|
"exposable": true,
|
||||||
"https": true,
|
"https": true,
|
||||||
"id": "portainer",
|
"id": "portainer",
|
||||||
"tipi_version": 21,
|
"tipi_version": 22,
|
||||||
"version": "2.20.2-alpine",
|
"version": "2.20.3-alpine",
|
||||||
"categories": [
|
"categories": ["utilities"],
|
||||||
"utilities"
|
|
||||||
],
|
|
||||||
"description": "",
|
"description": "",
|
||||||
"short_desc": "Making Docker and Kubernetes management easy.",
|
"short_desc": "Making Docker and Kubernetes management easy.",
|
||||||
"author": "portainer.io",
|
"author": "portainer.io",
|
||||||
"source": "https://github.com/portainer/portainer",
|
"source": "https://github.com/portainer/portainer",
|
||||||
"form_fields": [],
|
"form_fields": [],
|
||||||
"supported_architectures": [
|
"supported_architectures": ["arm64", "amd64"]
|
||||||
"arm64",
|
|
||||||
"amd64"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ version: "3.7"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
portainer:
|
portainer:
|
||||||
image: portainer/portainer-ce:2.20.2-alpine
|
image: portainer/portainer-ce:2.20.3-alpine
|
||||||
container_name: portainer
|
container_name: portainer
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user