LAB-linuxserver/docker-manyfold
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-manyfold.git synced 2026-02-05 19:40:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8 from linuxserver/3.21

Browse Source
This commit is contained in:
Adam 2025-01-14 11:39:20 +00:00 committed by GitHub
commit 2b05b20eae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:3.20
FROM ghcr.io/linuxserver/baseimage-alpine:3.21
ARG BUILD_DATE
ARG VERSION

2
Dockerfile.aarch64
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21
ARG BUILD_DATE
ARG VERSION

1
README.md
View File

@ -293,4 +293,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **12.01.25:** - Rebase to 3.21.
* **23.07.24:** - Initial Release.

3
readme-vars.yml
View File

@ -28,6 +28,8 @@ param_ports:
opt_param_usage_include_vols: true
opt_param_volumes:
- {vol_path: "/libraries", vol_host_path: "/path/to/libraries", desc: "Location of your 3D model libraries."}
readonly_supported: false
nonroot_supported: false
# application setup block
app_setup_block_enabled: true
app_setup_block: |
@ -83,4 +85,5 @@ init_diagram: |
"manyfold:latest" <- Base Images
# changelog
changelogs:
- {date: "12.01.25:", desc: "Rebase to Alpine 3.21."}
- {date: "23.07.24:", desc: "Initial Release."}

19
root/etc/s6-overlay/s6-rc.d/init-manyfold-config/run
View File

@ -24,34 +24,35 @@ if [[ ${DB_SCHEME} = "sqlite3" ]]; then
lsiown -R abc:abc \
/config
elif [[ ${DB_SCHEME} = "postgresql" ]]; then
DB_HOST=$(awk -F"@|:" '{print $4}' <<<"${DATABASE_URL}")
DB_PORT=$(awk -F"@|/" '{print $6}' <<<"${DATABASE_URL}")
DB_HOST=$(awk -F '@|:|/' '{print $6}' <<<"${DATABASE_URL}")
DB_PORT=$(awk -F '@|:|/' '{print $7}' <<<"${DATABASE_URL}")
DB_USER=$(awk -F '@|:|/' '{print $4}' <<<"${DATABASE_URL}")
if [[ ! ${DB_PORT} =~ [0-9]+ ]]; then DB_PORT=5432; fi
echo "Waiting for DB to be available"
END=$((SECONDS + 30))
while [[ ${SECONDS} -lt ${END} ]] && [[ -n "${DB_HOST+x}" ]]; do
if pg_isready -h "${DB_HOST}" -p "${DB_PORT}" -q; then
if [[ ! -f /dbwait.lock ]]; then
if pg_isready -h "${DB_HOST}" -p "${DB_PORT}" -U "${DB_USER}" -q; then
if [[ ! -f /run/dbwait.lock ]]; then
sleep 5
fi
touch /dbwait.lock
touch /run/dbwait.lock
break
else
sleep 1
fi
done
elif [[ ${DB_SCHEME} = "mysql2" ]]; then
DB_HOST=$(awk -F"@|:" '{print $4}' <<<"${DATABASE_URL}")
DB_PORT=$(awk -F"@|/" '{print $6}' <<<"${DATABASE_URL}")
DB_HOST=$(awk -F '@|:|/' '{print $6}' <<<"${DATABASE_URL}")
DB_PORT=$(awk -F '@|:|/' '{print $7}' <<<"${DATABASE_URL}")
if [[ ! ${DB_PORT} =~ [0-9]+ ]]; then DB_PORT=3306; fi
echo "Waiting for DB to be available"
END=$((SECONDS + 30))
while [[ ${SECONDS} -lt ${END} ]] && [[ -n "${DB_HOST+x}" ]]; do
if [[ $(/usr/bin/nc -w1 "${DB_HOST}" "${DB_PORT}" | tr -d '\0') ]]; then
if [[ ! -f /dbwait.lock ]]; then
if [[ ! -f /run/dbwait.lock ]]; then
sleep 5
fi
touch /dbwait.lock
touch /run/dbwait.lock
break
else
sleep 1

2
root/etc/s6-overlay/s6-rc.d/svc-manyfold/run
View File

@ -3,4 +3,4 @@
exec \
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 3214" \
cd /app/www s6-setuidgid abc foreman start
cd /app/www s6-setuidgid abc foreman start