diff --git a/CloudronManifest.json b/CloudronManifest.json index 089b45a..7b25903 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -5,13 +5,14 @@ "description": "file://DESCRIPTION.md", "changelog": "file://CHANGELOG.md", "tagline": "A modern client-server application for the Soulseek file-sharing network.", - "version": "1.0.0", + "version": "1.0.3", + "manifestVersion": 2, + "minBoxVersion": "8.3.1", "healthCheckPath": "/health", "httpPort": 5030, "addons": { "localstorage": {} }, - "manifestVersion": 2, "website": "https://zoemp.be/slskd", "contactEmail": "morgan@zoemp.be", "icon": "file://logo.png", @@ -19,7 +20,6 @@ "file sharing", "chat", "music" - ], - "minBoxVersion": "8.3.1" + ] } diff --git a/Dockerfile.cloudron b/Dockerfile.cloudron index 255b886..ce3c003 100644 --- a/Dockerfile.cloudron +++ b/Dockerfile.cloudron @@ -21,14 +21,23 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends \ tini jq ca-certificates gosu libstdc++6 \ && rm -rf /var/lib/apt/lists/* -RUN mkdir -p /app/code /app/data /run/slskd \ - && useradd -u 1000 -m -d /app/data -s /bin/bash cloudron + +# créer les dossiers et l'utilisateur cloudron +RUN mkdir -p /app/code /app/data /run/slskd/cache \ + && useradd -u 1000 -m -d /app/data -s /bin/bash cloudron \ + && chmod -R 777 /app/data /run/slskd/cache + +# copier binaire + UI COPY --from=downloader /tmp/slskd /app/code/slskd COPY --from=downloader /tmp/wwwroot /app/code/wwwroot + +# config exemple & script de démarrage COPY slskd.yml.example /app/code/slskd.yml.example COPY start.sh /app/code/start.sh + RUN chmod +x /app/code/slskd /app/code/start.sh \ - && chown -R cloudron:cloudron /app/code /app/data /run/slskd + && chown -R cloudron:cloudron /app/code + WORKDIR /app/code ENTRYPOINT ["/usr/bin/tini", "--"] CMD ["./start.sh"] diff --git a/VERSION b/VERSION index 5bc4571..21e8796 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1 @@ -1.0.0 - +1.0.3 diff --git a/build.sh b/build.sh index a5002a8..9970180 100755 --- a/build.sh +++ b/build.sh @@ -1,8 +1,26 @@ #!/usr/bin/env bash set -xeuo pipefail -VERSION=$(cat VERSION) -docker build --platform linux/amd64 -t dr.zoemp.be/slskd:${VERSION} -f Dockerfile.cloudron . -docker push dr.zoemp.be/slskd:${VERSION} -cloudron update --image dr.zoemp.be/slskd:${VERSION} --app slskd +VERSION=$(/dev/null; then + echo "🔄 Mise à jour de ${FQDN} → ${IMAGE}" + cloudron update \ + --image "${IMAGE}" \ + --app "${FQDN}" +else + echo "🚀 Installation de l’app sur ${FQDN}" + cloudron install \ + --image "${IMAGE}" \ + --location "${LOCATION}" \ + "${CLOUDRON_MANIFEST_ID:-slskd.zoemp.be}" +fi diff --git a/bump_version.sh b/bump_version.sh new file mode 100755 index 0000000..9ee34e1 --- /dev/null +++ b/bump_version.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +set -xeuo pipefail + +# Lit la version courante +VERSION=$(cat VERSION) + +# Sépare en MAJOR.MINOR.PATCH +IFS='.' read -r MAJOR MINOR PATCH <<< "$VERSION" + +case "${1:-}" in + major) + ((MAJOR++)) + MINOR=0 + PATCH=0 + ;; + minor) + ((MINOR++)) + PATCH=0 + ;; + patch) + ((PATCH++)) + ;; + *) + echo "Usage: $0 {major|minor|patch}" + exit 1 + ;; +esac + +NEW_VERSION="${MAJOR}.${MINOR}.${PATCH}" +echo "$NEW_VERSION" > VERSION +echo "Version bumpée en $NEW_VERSION" + diff --git a/dev.sh b/dev.sh index b7c2fbc..a447b2e 100755 --- a/dev.sh +++ b/dev.sh @@ -1,13 +1,16 @@ #!/usr/bin/env bash set -xeuo pipefail -VERSION=$(cat VERSION) -docker build --platform linux/amd64 -t dr.zoemp.be/slskd:${VERSION} -f Dockerfile.cloudron . +VERSION=$(