Merge remote-tracking branch 'origin/next' into 7802-volume-mappings-bug
This commit is contained in:
commit
3ffe900b31
8 changed files with 49 additions and 8 deletions
|
|
@ -1732,7 +1732,7 @@ public function loadComposeFile($isInit = false, ?string $restoreBaseDirectory =
|
||||||
$this->save();
|
$this->save();
|
||||||
|
|
||||||
if (str($e->getMessage())->contains('No such file')) {
|
if (str($e->getMessage())->contains('No such file')) {
|
||||||
throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile<br><br>Check if you used the right extension (.yaml or .yml) in the compose file name.");
|
throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile (branch: {$this->git_branch})<br><br>Check if you used the right extension (.yaml or .yml) in the compose file name.");
|
||||||
}
|
}
|
||||||
if (str($e->getMessage())->contains('fatal: repository') && str($e->getMessage())->contains('does not exist')) {
|
if (str($e->getMessage())->contains('fatal: repository') && str($e->getMessage())->contains('does not exist')) {
|
||||||
if ($this->deploymentType() === 'deploy_key') {
|
if ($this->deploymentType() === 'deploy_key') {
|
||||||
|
|
@ -1793,7 +1793,7 @@ public function loadComposeFile($isInit = false, ?string $restoreBaseDirectory =
|
||||||
$this->base_directory = $initialBaseDirectory;
|
$this->base_directory = $initialBaseDirectory;
|
||||||
$this->save();
|
$this->save();
|
||||||
|
|
||||||
throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile<br><br>Check if you used the right extension (.yaml or .yml) in the compose file name.");
|
throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile (branch: {$this->git_branch})<br><br>Check if you used the right extension (.yaml or .yml) in the compose file name.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
BIN
public/svgs/imgcompress.png
Normal file
BIN
public/svgs/imgcompress.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 92 KiB |
BIN
public/svgs/librespeed.png
Normal file
BIN
public/svgs/librespeed.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 108 KiB |
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
databasus:
|
databasus:
|
||||||
image: 'databasus/databasus:v2.18.0' # Released on 28 Dec, 2025
|
image: 'databasus/databasus:v3.16.2' # Released on 23 February, 2026
|
||||||
environment:
|
environment:
|
||||||
- SERVICE_URL_DATABASUS_4005
|
- SERVICE_URL_DATABASUS_4005
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
# category: productivity
|
# category: productivity
|
||||||
# tags: form, builder, forms, survey, quiz, open source, self-hosted, docker
|
# tags: form, builder, forms, survey, quiz, open source, self-hosted, docker
|
||||||
# logo: svgs/heyform.svg
|
# logo: svgs/heyform.svg
|
||||||
# port: 8000
|
# port: 9157
|
||||||
|
|
||||||
services:
|
services:
|
||||||
heyform:
|
heyform:
|
||||||
|
|
@ -16,7 +16,7 @@ services:
|
||||||
keydb:
|
keydb:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
environment:
|
environment:
|
||||||
- SERVICE_URL_HEYFORM_8000
|
- SERVICE_URL_HEYFORM_9157
|
||||||
- APP_HOMEPAGE_URL=${SERVICE_URL_HEYFORM}
|
- APP_HOMEPAGE_URL=${SERVICE_URL_HEYFORM}
|
||||||
- SESSION_KEY=${SERVICE_BASE64_64_SESSION}
|
- SESSION_KEY=${SERVICE_BASE64_64_SESSION}
|
||||||
- FORM_ENCRYPTION_KEY=${SERVICE_BASE64_64_FORM}
|
- FORM_ENCRYPTION_KEY=${SERVICE_BASE64_64_FORM}
|
||||||
|
|
@ -25,7 +25,7 @@ services:
|
||||||
- REDIS_PORT=6379
|
- REDIS_PORT=6379
|
||||||
- REDIS_PASSWORD=${SERVICE_PASSWORD_KEYDB}
|
- REDIS_PASSWORD=${SERVICE_PASSWORD_KEYDB}
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:8000 || exit 1"]
|
test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:9157 || exit 1"]
|
||||||
interval: 5s
|
interval: 5s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 3
|
retries: 3
|
||||||
|
|
|
||||||
19
templates/compose/imgcompress.yaml
Normal file
19
templates/compose/imgcompress.yaml
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
# documentation: https://imgcompress.karimzouine.com
|
||||||
|
# slogan: Offline image compression, conversion, and AI background removal for Docker homelabs.
|
||||||
|
# category: media
|
||||||
|
# tags: compress,photo,server,metadata
|
||||||
|
# logo: svgs/imgcompress.png
|
||||||
|
# port: 5000
|
||||||
|
|
||||||
|
services:
|
||||||
|
imgcompress:
|
||||||
|
image: karimz1/imgcompress:0.6.0
|
||||||
|
environment:
|
||||||
|
- SERVICE_URL_IMGCOMPRESS_5000
|
||||||
|
- DISABLE_LOGO=${DISABLE_LOGO:-false}
|
||||||
|
- DISABLE_STORAGE_MANAGEMENT=${DISABLE_STORAGE_MANAGEMENT:-false}
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "curl", "-f", "http://127.0.0.1:5000"]
|
||||||
|
interval: 30s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 3
|
||||||
22
templates/compose/librespeed.yaml
Normal file
22
templates/compose/librespeed.yaml
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
# documentation: https://github.com/librespeed/speedtest
|
||||||
|
# slogan: Self-hosted lightweight Speed Test.
|
||||||
|
# category: devtools
|
||||||
|
# tags: speedtest, internet-speed
|
||||||
|
# logo: svgs/librespeed.png
|
||||||
|
# port: 82
|
||||||
|
|
||||||
|
services:
|
||||||
|
librespeed:
|
||||||
|
container_name: librespeed
|
||||||
|
image: 'ghcr.io/librespeed/speedtest:latest'
|
||||||
|
environment:
|
||||||
|
- SERVICE_URL_LIBRESPEED_82
|
||||||
|
- MODE=standalone
|
||||||
|
- TELEMETRY=false
|
||||||
|
- DISTANCE=km
|
||||||
|
- WEBPORT=82
|
||||||
|
healthcheck:
|
||||||
|
test: 'curl 127.0.0.1:82 || exit 1'
|
||||||
|
timeout: 1s
|
||||||
|
interval: 1m0s
|
||||||
|
retries: 1
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
seaweedfs-master:
|
seaweedfs-master:
|
||||||
image: chrislusf/seaweedfs:4.05
|
image: chrislusf/seaweedfs:4.13
|
||||||
environment:
|
environment:
|
||||||
- SERVICE_URL_S3_8333
|
- SERVICE_URL_S3_8333
|
||||||
- AWS_ACCESS_KEY_ID=${SERVICE_USER_S3}
|
- AWS_ACCESS_KEY_ID=${SERVICE_USER_S3}
|
||||||
|
|
@ -61,7 +61,7 @@ services:
|
||||||
retries: 10
|
retries: 10
|
||||||
|
|
||||||
seaweedfs-admin:
|
seaweedfs-admin:
|
||||||
image: chrislusf/seaweedfs:4.05
|
image: chrislusf/seaweedfs:4.13
|
||||||
environment:
|
environment:
|
||||||
- SERVICE_URL_ADMIN_23646
|
- SERVICE_URL_ADMIN_23646
|
||||||
- SEAWEED_USER_ADMIN=${SERVICE_USER_ADMIN}
|
- SEAWEED_USER_ADMIN=${SERVICE_USER_ADMIN}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue