From 0207fb13251a63810a6f121030b449d1c810061a Mon Sep 17 00:00:00 2001 From: Thomas Legay Date: Thu, 27 Jul 2023 16:29:59 +0200 Subject: [PATCH] update --- ressources/adguardhome/debmaker | 2 +- ressources/babybuddy/debmaker | 2 +- ressources/budibase/README.MD | 6 ++--- ressources/budibase/debmaker | 21 +++++++-------- ressources/clouseau/debmaker | 12 ++++----- ressources/element-web/debmaker | 2 +- ressources/forgejo/debmaker | 2 +- ressources/gotify/debmaker | 4 +-- ressources/joplin-desktop/debmaker | 2 +- ressources/keycloak-radius-plugin/debmaker | 30 ++++++++++++++-------- ressources/keycloak/debmaker | 2 +- ressources/kimai2/debmaker | 2 +- ressources/mautrix-whatsapp/debmaker | 2 +- ressources/metabase/debmaker | 3 ++- ressources/minio/debmaker | 4 +-- ressources/rustdesk-server/debmaker | 2 +- ressources/vaultwarden/debmaker | 2 +- ressources/wallabag/debmaker | 8 +++--- 18 files changed, 60 insertions(+), 48 deletions(-) diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker index 499127a..e00e9ea 100755 --- a/ressources/adguardhome/debmaker +++ b/ressources/adguardhome/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.108.0-b.41 +VERSION=0.108.0-b.42 APP=adguardhome DEPOT=https://github.com/AdguardTeam/AdGuardHome.git GIT_VERSION=v${VERSION} diff --git a/ressources/babybuddy/debmaker b/ressources/babybuddy/debmaker index 1859735..29aa834 100755 --- a/ressources/babybuddy/debmaker +++ b/ressources/babybuddy/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.0.1 +VERSION=2.0.3 APP=babybuddy DEPOT=https://github.com/babybuddy/babybuddy.git GIT_VERSION=v${VERSION} diff --git a/ressources/budibase/README.MD b/ressources/budibase/README.MD index fd796ea..c386034 100644 --- a/ressources/budibase/README.MD +++ b/ressources/budibase/README.MD @@ -23,9 +23,9 @@ apt update apt install -y --no-install-recommends curl apt-transport-https gnupg wget ca-certificates software-properties-common wget -qO - https://deb.lgy.fr/install.sh | bash -wget -qO - https://deb.nodesource.com/setup_16.x | bash -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9 -apt-add-repository 'deb http://repos.azulsystems.com/debian stable main' +wget -qO - https://deb.nodesource.com/setup_18.x | bash +wget https://repos.azul.com/azul-repo.key -O - | gpg --dearmor -o /usr/share/keyrings/azul.gpg +echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" > /etc/apt/sources.list.d/zulu.list #echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" > /etc/apt/sources.list.d/yarn.list #wget -qO - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor > /usr/share/keyrings/yarnkey.gpg diff --git a/ressources/budibase/debmaker b/ressources/budibase/debmaker index b2dc05f..46fd755 100755 --- a/ressources/budibase/debmaker +++ b/ressources/budibase/debmaker @@ -1,13 +1,13 @@ #!/bin/bash -VERSION=2.3.21 +VERSION=2.8.28 APP=budibase DEPOT=https://github.com/Budibase/budibase.git -GIT_VERSION=v${VERSION} +GIT_VERSION=${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=20 -PACKAGE_DEPENDENCY="yarn nodejs" +PACKAGE_DEPENDENCY="yarn nodejs build-essential" main(){ base_package_upgrade @@ -17,30 +17,31 @@ main(){ makedeb } -envinit() { +envinit(){ configure_depot_yarn - configure_depot_nodejs 18 + configure_depot_nodejs 16 install_package_dependency } build() { cd /tmp/${APP} - npm install -g yarn jest lerna --force + npm install -g yarn jest lerna husky --force yarn - yarn bootstrap + #yarn bootstrap yarn build - + rm -fr /tmp/${APP}/packages/*/build } makedeb(){ PATH_DEB=/tmp/src/rootfs - grep ":" /tmp/${APP}/packages/server/src/environment.js | cut -d ":" -f 1 | tr -d ' ' | grep ^[A-Z] | awk '{print "#"$1"="}' | sort > ${PATH_DEB}/etc/default/budibase-server - grep ":" /tmp/${APP}/packages/worker/src/environment.ts | cut -d ":" -f 1 | tr -d ' ' | grep ^[A-Z] | awk '{print "#"$1"="}' | sort> ${PATH_DEB}/etc/default/budibase-worker + grep "process.env" packages/server/src/environment.ts | grep ":" | cut -d ":" -f 1 | tr -d ' ' | grep ^[A-Z] | awk '{print "#"$1"="}' | sort > ${PATH_DEB}/etc/default/budibase-server + grep "process.env" packages/worker/src/environment.ts | grep ":" | cut -d ":" -f 1 | tr -d ' ' | grep ^[A-Z] | awk '{print "#"$1"="}' | sort > ${PATH_DEB}/etc/default/budibase-worker mkdir -p ${PATH_DEB}/opt/budibase/ cp -fr /tmp/${APP}/packages/* ${PATH_DEB}/opt/budibase/ + cp -fr /tmp/${APP}/node_modules ${PATH_DEB}/opt/budibase/ mkdir -p ${PATH_DEB}/opt/budibase/server/client cp ${PATH_DEB}/opt/budibase/client/manifest.json ${PATH_DEB}/opt/budibase/server/client cp ${PATH_DEB}/opt/budibase/client/dist/budibase-client.js ${PATH_DEB}/opt/budibase/server/client diff --git a/ressources/clouseau/debmaker b/ressources/clouseau/debmaker index 06b9d4f..d512095 100755 --- a/ressources/clouseau/debmaker +++ b/ressources/clouseau/debmaker @@ -1,13 +1,13 @@ #!/bin/bash -VERSION=2.21.1 +VERSION=2.21.6 APP=clouseau DEPOT=https://github.com/cloudant-labs/clouseau.git GIT_VERSION=${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) -DEBIAN_VERSION_CODENAME=bullseye +DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=3 -PACKAGE_DEPENDENCY="software-properties-common erlang" +PACKAGE_DEPENDENCY="software-properties-common erlang mvn" main(){ envinit @@ -19,12 +19,12 @@ main(){ envinit() { base_package_upgrade install_package_dependency - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9 - apt-add-repository 'deb http://repos.azulsystems.com/debian stable main' + wget https://repos.azul.com/azul-repo.key | gpg --dearmor -O /usr/share/keyrings/azul.gpg + echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" > /etc/apt/sources.list.d/zulu.list apt-get update apt-get install -y --no-install-recommends zulu-7 mkdir -p /usr/share/maven - wget -O - https://dlcdn.apache.org/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.tar.gz | tar -zxC /usr/share/maven --strip-components=1 + wget -O - https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.tar.gz | tar -zxC /usr/share/maven --strip-components=1 rm -f /usr/bin/mvn ln -s /usr/share/maven/bin/mvn /usr/bin/mvn diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker index e24663f..de4459b 100755 --- a/ressources/element-web/debmaker +++ b/ressources/element-web/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.11.33 +VERSION=1.11.36 APP=element-web DEPOT=https://github.com/vector-im/element-web.git GIT_VERSION=v${VERSION} diff --git a/ressources/forgejo/debmaker b/ressources/forgejo/debmaker index 96af513..bfd0693 100755 --- a/ressources/forgejo/debmaker +++ b/ressources/forgejo/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.19.3-0 +VERSION=1.20.1-0 APP=forgejo DEPOT=https://codeberg.org/forgejo/forgejo GIT_VERSION=v${VERSION} diff --git a/ressources/gotify/debmaker b/ressources/gotify/debmaker index ed993a6..2885d40 100755 --- a/ressources/gotify/debmaker +++ b/ressources/gotify/debmaker @@ -1,10 +1,10 @@ #!/bin/bash APP=gotify -VERSION=2.2.4 +VERSION=2.3.0 GIT_VERSION=v$VERSION DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) -DEBIAN_VERSION_CODENAME=bullseye +DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=6 DEPOT=https://github.com/gotify/server.git PACKAGE_DEPENDENCY="build-essential nodejs yarn" diff --git a/ressources/joplin-desktop/debmaker b/ressources/joplin-desktop/debmaker index 6aefb83..e2e749d 100755 --- a/ressources/joplin-desktop/debmaker +++ b/ressources/joplin-desktop/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.12.7 +VERSION=2.12.9 APP=joplin-desktop GIT_VERSION=v${VERSION} DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) diff --git a/ressources/keycloak-radius-plugin/debmaker b/ressources/keycloak-radius-plugin/debmaker index edd0faf..2358704 100755 --- a/ressources/keycloak-radius-plugin/debmaker +++ b/ressources/keycloak-radius-plugin/debmaker @@ -1,24 +1,33 @@ #!/bin/bash -VERSION=1.4.11-21.0.0 +VERSION=1.4.99-22.0.0 APP=keycloak-radius-plugin DEPOT=https://github.com/vzakharchenko/keycloak-radius-plugin.git GIT_VERSION=v${VERSION} +GIT_VERSION=last DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=12 PACKAGE_DEPENDENCY="default-jdk maven" +shopt -s extglob + main(){ base_package_upgrade install_package_dependency - get_git_source + #get_git_source + [ -e /tmp/${APP} ] && rm -fr /tmp/${APP} + git clone https://github.com/elkman/keycloak-radius-plugin.git /tmp/${APP} + cd /tmp/${APP} + git checkout remotes/origin/feature/upgrade-to-kc22.0.1 build makedeb } build() { cd /tmp/${APP}/keycloak-plugins + KEYCLOAK_VERSION=22.0.1 + sed -i "s/[0-9]\+\(\.[0-9]\+\)*<\/keycloak.version>/${KEYCLOAK_VERSION}<\/keycloak.version>/g" pom.xml mvn clean install -DskipTestsuite -DskipExamples -DskipTests } @@ -27,14 +36,15 @@ makedeb(){ mkdir -p ${PATH_DEB}/usr/lib/keycloak/providers - cp /tmp/${APP}/keycloak-plugins/chillispot-radius-plugin/target/original-chillispot-radius-plugin-1.4.11.jar ${PATH_DEB}/usr/lib/keycloak/providers - cp /tmp/${APP}/keycloak-plugins/cisco-radius-plugin/target/original-cisco-radius-plugin-1.4.11.jar ${PATH_DEB}/usr/lib/keycloak/providers - cp /tmp/${APP}/keycloak-plugins/proxy-radius-plugin/target/original-proxy-radius-plugin-1.4.11.jar ${PATH_DEB}/usr/lib/keycloak/providers - cp /tmp/${APP}/keycloak-plugins/radius-disconnect-plugin/target/original-radius-disconnect-plugin-1.4.11.jar ${PATH_DEB}/usr/lib/keycloak/providers - cp /tmp/${APP}/keycloak-plugins/radius-plugin/target/original-radius-plugin-1.4.11.jar ${PATH_DEB}/usr/lib/keycloak/providers - cp /tmp/${APP}/keycloak-plugins/rad-sec-plugin/target/original-rad-sec-plugin-1.4.11.jar ${PATH_DEB}/usr/lib/keycloak/providers - cp /tmp/${APP}/keycloak-plugins/mikrotik-radius-plugin/target/original-mikrotik-radius-plugin-1.4.11.jar ${PATH_DEB}/usr/lib/keycloak/providers - cp /tmp/${APP}/keycloak-plugins/radius-theme/target/radius-theme-1.4.11.zip ${PATH_DEB}/usr/lib/keycloak/providers + + cp /tmp/${APP}/keycloak-plugins/chillispot-radius-plugin/target/chillispot-radius-plugin-*[[:digit:]].*[[:digit:]].*[[:digit:]]+(-SNAPSHOT).jar ${PATH_DEB}/usr/lib/keycloak/providers + cp /tmp/${APP}/keycloak-plugins/cisco-radius-plugin/target/cisco-radius-plugin-*[[:digit:]].*[[:digit:]].*[[:digit:]]+(-SNAPSHOT).jar ${PATH_DEB}/usr/lib/keycloak/providers + cp /tmp/${APP}/keycloak-plugins/proxy-radius-plugin/target/proxy-radius-plugin-*[[:digit:]].*[[:digit:]].*[[:digit:]]+(-SNAPSHOT).jar ${PATH_DEB}/usr/lib/keycloak/providers + cp /tmp/${APP}/keycloak-plugins/radius-disconnect-plugin/target/radius-disconnect-plugin-*[[:digit:]].*[[:digit:]].*[[:digit:]]+(-SNAPSHOT).jar ${PATH_DEB}/usr/lib/keycloak/providers + cp /tmp/${APP}/keycloak-plugins/radius-plugin/target/radius-plugin-*[[:digit:]].*[[:digit:]].*[[:digit:]]+(-SNAPSHOT).jar ${PATH_DEB}/usr/lib/keycloak/providers + cp /tmp/${APP}/keycloak-plugins/rad-sec-plugin/target/rad-sec-plugin-*[[:digit:]].*[[:digit:]].*[[:digit:]]+(-SNAPSHOT).jar ${PATH_DEB}/usr/lib/keycloak/providers + cp /tmp/${APP}/keycloak-plugins/mikrotik-radius-plugin/target/mikrotik-radius-plugin-*[[:digit:]].*[[:digit:]].*[[:digit:]]+(-SNAPSHOT).jar ${PATH_DEB}/usr/lib/keycloak/providers + cp /tmp/${APP}/keycloak-plugins/radius-theme/target/radius-theme-*[[:digit:]].*[[:digit:]].*[[:digit:]]+(-SNAPSHOT).zip ${PATH_DEB}/usr/lib/keycloak/providers sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist diff --git a/ressources/keycloak/debmaker b/ressources/keycloak/debmaker index e69e96f..1ead68e 100755 --- a/ressources/keycloak/debmaker +++ b/ressources/keycloak/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=22.0.0 +VERSION=22.0.1 APP=keycloak DEPOT=https://github.com/keycloak/keycloak.git GIT_VERSION=${VERSION} diff --git a/ressources/kimai2/debmaker b/ressources/kimai2/debmaker index 6c825cd..e75fa55 100755 --- a/ressources/kimai2/debmaker +++ b/ressources/kimai2/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.0.28 +VERSION=2.0.29 APP=kimai2 DEPOT=https://github.com/kevinpapst/kimai2.git GIT_VERSION=${VERSION} diff --git a/ressources/mautrix-whatsapp/debmaker b/ressources/mautrix-whatsapp/debmaker index 7c50a4f..9f315dd 100755 --- a/ressources/mautrix-whatsapp/debmaker +++ b/ressources/mautrix-whatsapp/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.8.4 +VERSION=0.9.0 APP=mautrix-whatsapp DEPOT=https://github.com/mautrix/whatsapp.git GIT_VERSION=v${VERSION} diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker index 37b2329..46f2a3e 100755 --- a/ressources/metabase/debmaker +++ b/ressources/metabase/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.46.6 +VERSION=0.46.6.2 APP=metabase DEPOT=https://github.com/metabase/metabase.git GIT_VERSION=v$VERSION @@ -23,6 +23,7 @@ main(){ build() { cd /tmp/${APP}/ PATH=$PATH:/usr/local/bin + npx browserslist@latest --update-db ./bin/build.sh } diff --git a/ressources/minio/debmaker b/ressources/minio/debmaker index d424fe8..03aaef0 100755 --- a/ressources/minio/debmaker +++ b/ressources/minio/debmaker @@ -1,11 +1,11 @@ #!/bin/bash -VERSION=RELEASE.2023-01-20T02-05-44Z +VERSION=RELEASE.2023-07-21T21-12-44Z APP=minio DEPOT=https://github.com/minio/minio.git GIT_VERSION=$VERSION DEB_VERSION=${VERSION:8:4}${VERSION:13:2}${VERSION:16:2}${VERSION:19:2}${VERSION:22:2}-$(date +%Y%m%d%H%M) -DEBIAN_VERSION_CODENAME=bullseye +DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=5 PACKAGE_DEPENDENCY="build-essential" diff --git a/ressources/rustdesk-server/debmaker b/ressources/rustdesk-server/debmaker index 5a08e33..0d79ff4 100755 --- a/ressources/rustdesk-server/debmaker +++ b/ressources/rustdesk-server/debmaker @@ -1,7 +1,7 @@ #!/bin/bash APP=rustdesk-server -VERSION=1.1.8 +VERSION=1.1.8-1 GIT_VERSION=$VERSION DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye diff --git a/ressources/vaultwarden/debmaker b/ressources/vaultwarden/debmaker index f71e3e3..f2cf88f 100755 --- a/ressources/vaultwarden/debmaker +++ b/ressources/vaultwarden/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.29.0 +VERSION=1.29.1 APP=vaultwarden GIT_VERSION=$VERSION DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) diff --git a/ressources/wallabag/debmaker b/ressources/wallabag/debmaker index d8dd155..f13d49f 100755 --- a/ressources/wallabag/debmaker +++ b/ressources/wallabag/debmaker @@ -1,10 +1,10 @@ #!/bin/bash -VERSION=2.5.4 +VERSION=2.6.1 APP=wallabag GIT_VERSION=$VERSION DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) -DEBIAN_VERSION_CODENAME=bullseye +DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=4 DEPOT=https://github.com/wallabag/wallabag.git @@ -20,10 +20,10 @@ main(){ envinit() { configure_depot_yarn - configure_depot_nodejs + configure_depot_nodejs 18 install_package_dependency cd /opt/ - wget https://getcomposer.org/download/2.2.13/composer.phar -O /opt/composer.phar + wget https://getcomposer.org/download/2.5.8/composer.phar -O /opt/composer.phar } build() {