Compare commits
No commits in common. "4f8e3da48cef6a0c611772187e1176eaa8e56532" and "b504e354a13ebb50ca4104cb0e4e13a187de973c" have entirely different histories.
4f8e3da48c
...
b504e354a1
|
@ -2,8 +2,6 @@
|
||||||
SCRIPT_DIR=${SCRIPT_DIR:-"$( cd -- "$( dirname -- "$0" )" &> /dev/null && pwd )"}
|
SCRIPT_DIR=${SCRIPT_DIR:-"$( cd -- "$( dirname -- "$0" )" &> /dev/null && pwd )"}
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
BASE_NAME="${0##*/}"
|
|
||||||
SCRIPT_NAME="${SCRIPT_DIR}/${BASE_NAME}"
|
|
||||||
|
|
||||||
# Function to compare semantic versions
|
# Function to compare semantic versions
|
||||||
compare_major_version() {
|
compare_major_version() {
|
||||||
|
@ -22,7 +20,7 @@ if [[ "${1}" =~ ^(-h|--help$) ]]; then
|
||||||
"Query runtipi's current version and compares with what is available online" \
|
"Query runtipi's current version and compares with what is available online" \
|
||||||
"" \
|
"" \
|
||||||
"Usage:" \
|
"Usage:" \
|
||||||
" ${BASE_NAME} -h | --help | [next] [<version>] " \
|
" ${0##*/} -h | --help | [next] [<version>] " \
|
||||||
"" \
|
"" \
|
||||||
"Arguments:" \
|
"Arguments:" \
|
||||||
" -h | --help Display usage" \
|
" -h | --help Display usage" \
|
||||||
|
@ -38,51 +36,7 @@ if [[ "${1}" =~ ^(-h|--help$) ]]; then
|
||||||
" major versions do not match"
|
" major versions do not match"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# --- tab completion ---
|
|
||||||
completion_bash() {
|
|
||||||
cat <<EOF
|
|
||||||
_runtipi_checkver()
|
|
||||||
{
|
|
||||||
local cur prev opts
|
|
||||||
COMPREPLY=()
|
|
||||||
cur="\${COMP_WORDS[COMP_CWORD]}"
|
|
||||||
prev="\${COMP_WORDS[COMP_CWORD-1]}"
|
|
||||||
opts="next --help -h"
|
|
||||||
|
|
||||||
case "\${prev}" in
|
|
||||||
next)
|
|
||||||
COMPREPLY=( \$(compgen -W "\$("${SCRIPT_NAME}" --next)" -- \${cur}) )
|
|
||||||
return 0
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
COMPREPLY=( \$(compgen -W "\${opts}" -- \${cur}) )
|
|
||||||
return 0
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
complete -F _runtipi_checkver ${BASE_NAME}
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
completion_zsh() {
|
|
||||||
cat <<EOF
|
|
||||||
_runtipi_checkver() {
|
|
||||||
_values "version" next --help -h
|
|
||||||
}
|
|
||||||
compdef _runtipi_checkver ${BASE_NAME}
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ "$1" == "completion" ]; then
|
|
||||||
if [ "$2" == "bash" ]; then
|
|
||||||
completion_bash
|
|
||||||
elif [ "$2" == "zsh" ]; then
|
|
||||||
completion_zsh
|
|
||||||
fi
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Get Current Version of Runtipi
|
# Get Current Version of Runtipi
|
||||||
runtipi_path=${RUNTIPI_DIR:-"$(cd -- "${SCRIPT_DIR}/../.." &> /dev/null && pwd )"}
|
runtipi_path=${RUNTIPI_DIR:-"$(cd -- "${SCRIPT_DIR}/../.." &> /dev/null && pwd )"}
|
||||||
current_version="$1"
|
current_version="$1"
|
||||||
|
@ -143,4 +97,3 @@ elif [ "$next_tag" != "$current_version" ]; then
|
||||||
compare_major_version "$next_tag" "$current_version"
|
compare_major_version "$next_tag" "$current_version"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
|
|
|
@ -4,7 +4,6 @@ services:
|
||||||
environment:
|
environment:
|
||||||
PUID: "${HOST_UID}"
|
PUID: "${HOST_UID}"
|
||||||
PGID: "${HOST_GID}"
|
PGID: "${HOST_GID}"
|
||||||
UMASK: "${HOST_UMASK:-022}"
|
|
||||||
# RUNTIPI Environment
|
# RUNTIPI Environment
|
||||||
RUNTIPI_APP_PORT: "${APP_PORT}"
|
RUNTIPI_APP_PORT: "${APP_PORT}"
|
||||||
RUNTIPI_APP_ID: "${APP_ID}"
|
RUNTIPI_APP_ID: "${APP_ID}"
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
# http routing section
|
|
||||||
http:
|
|
||||||
routers:
|
|
||||||
<app>-on-kateryna:
|
|
||||||
service: kateryna-<app>
|
|
||||||
rule: Host(`<app>.szk.li`) && PathPrefix(`/`)
|
|
||||||
entrypoints:
|
|
||||||
- websecure
|
|
||||||
tls:
|
|
||||||
certresolver: myresolver
|
|
||||||
middlewares:
|
|
||||||
- authentik_sysmgr
|
|
||||||
|
|
||||||
services:
|
|
||||||
# Define how to reach an existing service on our infrastructure
|
|
||||||
kateryna-<app>:
|
|
||||||
loadBalancer:
|
|
||||||
servers:
|
|
||||||
- url: http://192.168.222.43:80
|
|
|
@ -1,19 +0,0 @@
|
||||||
# http routing section
|
|
||||||
http:
|
|
||||||
routers:
|
|
||||||
jd-on-kateryna:
|
|
||||||
service: kateryna-jd
|
|
||||||
rule: Host(`jd.szk.li`) && PathPrefix(`/`)
|
|
||||||
entrypoints:
|
|
||||||
- websecure
|
|
||||||
tls:
|
|
||||||
certresolver: myresolver
|
|
||||||
middlewares:
|
|
||||||
- authentik_sysmgr
|
|
||||||
|
|
||||||
services:
|
|
||||||
# Define how to reach an existing service on our infrastructure
|
|
||||||
kateryna-jd:
|
|
||||||
loadBalancer:
|
|
||||||
servers:
|
|
||||||
- url: http://192.168.222.83:80
|
|
|
@ -1,37 +0,0 @@
|
||||||
http:
|
|
||||||
routers:
|
|
||||||
# code-server:
|
|
||||||
# middlewares:
|
|
||||||
# - authentik_sysmgr@file
|
|
||||||
# sonarr:
|
|
||||||
# middlewares:
|
|
||||||
# - authentik_sysmgr@file
|
|
||||||
|
|
||||||
forgejo-more:
|
|
||||||
service: forgejo@docker
|
|
||||||
rule: Host(`code.lksz.me`)
|
|
||||||
entrypoints:
|
|
||||||
- websecure
|
|
||||||
tls:
|
|
||||||
certresolver: myresolver
|
|
||||||
|
|
||||||
traefik-dashboard:
|
|
||||||
service: dashboard@internal
|
|
||||||
rule: Host(`tfk.szk.li`) && PathPrefix(`/`)
|
|
||||||
entrypoints:
|
|
||||||
- websecure
|
|
||||||
tls:
|
|
||||||
certresolver: myresolver
|
|
||||||
middlewares:
|
|
||||||
- authentik_sysmgr@file
|
|
||||||
- dashboard_redirect@internal
|
|
||||||
|
|
||||||
traefik-api:
|
|
||||||
service: api@internal
|
|
||||||
rule: Host(`tfk.szk.li`) && PathPrefix(`/api`)
|
|
||||||
entrypoints:
|
|
||||||
- websecure
|
|
||||||
tls:
|
|
||||||
certresolver: myresolver
|
|
||||||
middlewares:
|
|
||||||
- authentik_sysmgr@file
|
|
Loading…
Reference in New Issue