Merge remote-tracking branch 'upstream/develop' into feature/custom-tf-model-127

This commit is contained in:
raystlin 2025-04-13 15:27:50 +00:00
commit e55536e581
96 changed files with 1228 additions and 435 deletions

75
scripts/dist/install-nats.sh vendored Executable file
View file

@ -0,0 +1,75 @@
#!/usr/bin/env bash
# Installs the nats-server binary, a cloud-native messaging system, on Linux.
# bash <(curl -s https://raw.githubusercontent.com/photoprism/photoprism/develop/scripts/dist/install-nats.sh)
set -e
# Show usage information if first argument is --help.
if [[ ${1} == "--help" ]]; then
echo "Usage: ${0##*/} [destdir] [version]" 1>&2
exit 0
fi
# You can provide a custom installation directory as the first argument.
DESTDIR=$(realpath "${1:-/usr/local}")
# Determine target architecture.
if [[ $PHOTOPRISM_ARCH ]]; then
SYSTEM_ARCH=$PHOTOPRISM_ARCH
else
SYSTEM_ARCH=$(uname -m)
fi
DESTARCH=${BUILD_ARCH:-$SYSTEM_ARCH}
case $DESTARCH in
amd64 | AMD64 | x86_64 | x86-64)
DESTARCH=amd64
;;
arm64 | ARM64 | aarch64)
DESTARCH=arm64
;;
arm | ARM | aarch | armv7l | armhf)
DESTARCH=arm7
;;
*)
echo "Unsupported Machine Architecture: \"$DESTARCH\"" 1>&2
exit 1
;;
esac
. /etc/os-release
# Abort if not executed as root.
if [[ $(id -u) != "0" ]] && [[ $DESTDIR == "/usr" || $DESTDIR == "/usr/local" ]]; then
echo "Error: Run ${0##*/} as root to install in a system directory!" 1>&2
exit 1
fi
echo "Installing NATS for ${DESTARCH^^}..."
# Alternatively, users can specify a custom version to install as the second argument.
GITHUB_LATEST=$(curl --silent "https://api.github.com/repos/nats-io/nats-server/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
VERSION=${2:-$GITHUB_LATEST}
ARCHIVE="nats-server-${VERSION}-linux-${DESTARCH}.tar.gz"
GITHUB_URL="https://github.com/nats-io/nats-server/releases/download/${VERSION}/${ARCHIVE}"
echo "------------------------------------------------"
echo "VERSION : ${VERSION}"
echo "LATEST : ${GITHUB_LATEST}"
echo "DOWNLOAD: ${GITHUB_URL}"
echo "DESTDIR : ${DESTDIR}"
echo "------------------------------------------------"
# Adjust the installation path because the archive does not contain a bin directory.
DESTDIR="${DESTDIR}/bin"
echo "Extracting the nats-server binary in \"${ARCHIVE}\" to \"${DESTDIR}\"..."
mkdir -p "${DESTDIR}"
curl -fsSL "${GITHUB_URL}" | tar --overwrite --mode=755 -xz -C "${DESTDIR}" --strip-components=1 --wildcards --no-anchored "nats-server"
echo "Done."

71
scripts/dist/install-qdrant.sh vendored Executable file
View file

@ -0,0 +1,71 @@
#!/usr/bin/env bash
# Installs the qdrant binary, a vector search engine, on Linux.
# bash <(curl -s https://raw.githubusercontent.com/photoprism/photoprism/develop/scripts/dist/install-qdrant.sh)
set -e
# Show usage information if first argument is --help.
if [[ ${1} == "--help" ]]; then
echo "Usage: ${0##*/} [destdir] [version]" 1>&2
exit 0
fi
# You can provide a custom installation directory as the first argument.
DESTDIR=$(realpath "${1:-/usr/local}")
# Determine target architecture.
if [[ $PHOTOPRISM_ARCH ]]; then
SYSTEM_ARCH=$PHOTOPRISM_ARCH
else
SYSTEM_ARCH=$(uname -m)
fi
DESTARCH=${BUILD_ARCH:-$SYSTEM_ARCH}
case $DESTARCH in
amd64 | AMD64 | x86_64 | x86-64)
DESTARCH=x86_64
;;
arm64 | ARM64 | aarch64)
DESTARCH=aarch64
;;
*)
echo "Unsupported Machine Architecture: \"$DESTARCH\"" 1>&2
exit 1
;;
esac
. /etc/os-release
# Abort if not executed as root.
if [[ $(id -u) != "0" ]] && [[ $DESTDIR == "/usr" || $DESTDIR == "/usr/local" ]]; then
echo "Error: Run ${0##*/} as root to install in a system directory!" 1>&2
exit 1
fi
echo "Installing Qdrant for ${DESTARCH^^}..."
# Alternatively, users can specify a custom version to install as the second argument.
GITHUB_LATEST=$(curl --silent "https://api.github.com/repos/qdrant/qdrant/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
VERSION=${2:-$GITHUB_LATEST}
ARCHIVE="qdrant-${DESTARCH}-unknown-linux-musl.tar.gz"
GITHUB_URL="https://github.com/qdrant/qdrant/releases/download/${VERSION}/${ARCHIVE}"
echo "------------------------------------------------"
echo "VERSION : ${VERSION}"
echo "LATEST : ${GITHUB_LATEST}"
echo "DOWNLOAD: ${GITHUB_URL}"
echo "DESTDIR : ${DESTDIR}"
echo "------------------------------------------------"
# Adjust the installation path because the archive does not contain a bin directory.
DESTDIR="${DESTDIR}/bin"
echo "Extracting the qdrant binary in \"${ARCHIVE}\" to \"${DESTDIR}\"..."
mkdir -p "${DESTDIR}"
curl -fsSL "${GITHUB_URL}" | tar --overwrite --mode=755 -xz -C "${DESTDIR}" --wildcards --no-anchored "qdrant"
echo "Done."

View file

@ -58,27 +58,29 @@ set -eu
S6_OVERLAY_LATEST=$(curl --silent "https://api.github.com/repos/just-containers/s6-overlay/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
S6_OVERLAY_VERSION=${1:-$S6_OVERLAY_LATEST}
S6_ARCH_URL="https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz"
S6_NOARCH_URL="https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz"
ARCHIVE_NOARCH="s6-overlay-noarch.tar.xz"
ARCHIVE_BINARY="s6-overlay-${S6_OVERLAY_ARCH}.tar.xz"
S6_NOARCH_URL="https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/${ARCHIVE_NOARCH}"
S6_BINARY_URL="https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/${ARCHIVE_BINARY}"
echo "Installing S6 Overlay..."
echo "Installing S6 Overlay for ${S6_OVERLAY_ARCH^^}..."
echo "------------------------------------------------"
echo "VERSION : ${S6_OVERLAY_VERSION}"
echo "LATEST : ${S6_OVERLAY_LATEST}"
echo "DESTDIR : ${S6_OVERLAY_DESTDIR}"
echo "BINARY URL: ${S6_ARCH_URL}"
echo "NOARCH URL: ${S6_NOARCH_URL}"
echo "VERSION: ${S6_OVERLAY_VERSION}"
echo "LATEST : ${S6_OVERLAY_LATEST}"
echo "NOARCH : ${ARCHIVE_NOARCH}"
echo "BINARY : ${ARCHIVE_BINARY}"
echo "DESTDIR: ${S6_OVERLAY_DESTDIR}"
echo "------------------------------------------------"
# Create the destination directory if it does not already exist.
mkdir -p "${S6_OVERLAY_DESTDIR}"
# Download and install the s6-overlay release from GitHub.
echo "Extracting \"$S6_ARCH_URL\" to \"$S6_OVERLAY_DESTDIR\"."
curl -fsSL "$S6_ARCH_URL" | tar -C "${S6_OVERLAY_DESTDIR}" -Jxp
echo "Extracting \"$S6_NOARCH_URL\" to \"$S6_OVERLAY_DESTDIR\"."
echo "Extracting \"$S6_NOARCH_URL\" to \"$S6_OVERLAY_DESTDIR\"..."
curl -fsSL "$S6_NOARCH_URL" | tar -C "${S6_OVERLAY_DESTDIR}" -Jxp
echo "Extracting \"$S6_BINARY_URL\" to \"$S6_OVERLAY_DESTDIR\"..."
curl -fsSL "$S6_BINARY_URL" | tar -C "${S6_OVERLAY_DESTDIR}" -Jxp
echo "Done."

View file

3
scripts/dist/services/photoprism/run vendored Normal file
View file

@ -0,0 +1,3 @@
#!/command/execlineb -P
with-contenv
/scripts/cmd.sh /opt/photoprism/bin/photoprism start

1
scripts/dist/services/photoprism/type vendored Normal file
View file

@ -0,0 +1 @@
longrun