From 4aa8111f98051d855dc78adec87a4c7abe53e481 Mon Sep 17 00:00:00 2001 From: Thomas Legay Date: Sun, 17 Mar 2024 23:55:26 +0100 Subject: [PATCH] update --- lib/exec_in_chroot.sh | 14 +++++++------- postrun.sh | 3 +++ ressources/bitwarden-desktop/debmaker | 2 +- ressources/forgejo/debmaker | 2 +- ressources/glpi/debmaker | 2 +- ressources/joplin-desktop/debmaker | 4 ++-- ressources/keycloak/debmaker | 2 +- ressources/metabase/debmaker | 4 ++-- ressources/vaultwarden/debmaker | 2 +- ressources/zigbee2mqtt/debmaker | 2 +- 10 files changed, 20 insertions(+), 17 deletions(-) create mode 100755 postrun.sh diff --git a/lib/exec_in_chroot.sh b/lib/exec_in_chroot.sh index f798c12..b351a8f 100755 --- a/lib/exec_in_chroot.sh +++ b/lib/exec_in_chroot.sh @@ -29,12 +29,12 @@ configure_depot_yarn() { } configure_depot_nodejs() { - NODE_MAJOR=16 + NODE_MAJOR=18 [ ! "$1" == "" ] && NODE_MAJOR=$1 echo -e "Package: nodejs\\nPin: version $NODE_MAJOR.*\\nPin-Priority: 1000" > /etc/apt/preferences.d/nodejs - echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" > /etc/apt/sources.list.d/nodesource.list - [ -f /etc/apt/keyrings/nodesource.gpg ] || wget -qO - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg + echo "deb https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" > /etc/apt/sources.list.d/nodesource.list + [ -f /etc/apt/trusted.gpg.d/nodesource.gpg ] || wget -qO - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/nodesource.gpg } install_go() { @@ -58,10 +58,10 @@ install_clojure() { } install_composer(){ - wget https://getcomposer.org/installer -O /tmp/installer - php /tmp/installer - php composer-setup.php --install-dir=/usr/bin - rm /tmp/installer + wget https://getcomposer.org/installer -O /tmp/composer-setup.php + php /tmp/composer-setup.php --install-dir=/usr/bin + rm /tmp/composer-setup.php + mv /usr/bin/composer.phar /usr/bin/composer } minimum_package() { diff --git a/postrun.sh b/postrun.sh new file mode 100755 index 0000000..08b45f1 --- /dev/null +++ b/postrun.sh @@ -0,0 +1,3 @@ +rsync -a --delete -e 'ssh -J lgy.fr' ./dist/ deb.net.lgy.fr:/tmp/new +ssh -R /root/.gnupg/S.gpg-agent:/run/user/1000/gnupg/S.gpg-agent.extra -J lgy.fr deb.net.lgy.fr 'reprepro -Vb /var/www/html/ includedeb tools /tmp/new/*' +#ssh -R /root/.gnupg/S.gpg-agent:/run/user/1000/gnupg/S.gpg-agent.extra -J lgy.fr deb.net.lgy.fr 'reprepro -Vb /var/www/html/ export tools /tmp/new/*' diff --git a/ressources/bitwarden-desktop/debmaker b/ressources/bitwarden-desktop/debmaker index a70ca80..17d91b3 100755 --- a/ressources/bitwarden-desktop/debmaker +++ b/ressources/bitwarden-desktop/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2023.10.0 +VERSION=2024.3.0 APP=bitwarden-desktop DEPOT=https://github.com/bitwarden/clients.git GIT_VERSION=desktop-v${VERSION} diff --git a/ressources/forgejo/debmaker b/ressources/forgejo/debmaker index c1694ce..f81c994 100755 --- a/ressources/forgejo/debmaker +++ b/ressources/forgejo/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.20.5-0 +VERSION=1.21.7-0 APP=forgejo DEPOT=https://codeberg.org/forgejo/forgejo GIT_VERSION=v${VERSION} diff --git a/ressources/glpi/debmaker b/ressources/glpi/debmaker index efce01d..771167a 100755 --- a/ressources/glpi/debmaker +++ b/ressources/glpi/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=10.0.10 +VERSION=10.0.14 APP=glpi DEPOT=https://github.com/glpi-project/glpi.git GIT_VERSION=${VERSION} diff --git a/ressources/joplin-desktop/debmaker b/ressources/joplin-desktop/debmaker index 4ccd1ae..68da241 100755 --- a/ressources/joplin-desktop/debmaker +++ b/ressources/joplin-desktop/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.13.6 +VERSION=2.14.14 APP=joplin-desktop GIT_VERSION=v${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) @@ -12,7 +12,7 @@ PACKAGE_DEPENDENCY="build-essential python-is-python3 nodejs rsync yarn" main(){ base_package_upgrade configure_depot_yarn - configure_depot_nodejs + configure_depot_nodejs 18 install_package_dependency get_git_source build diff --git a/ressources/keycloak/debmaker b/ressources/keycloak/debmaker index b5af096..2a1e40c 100755 --- a/ressources/keycloak/debmaker +++ b/ressources/keycloak/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=22.0.5 +VERSION=24.0.1 APP=keycloak DEPOT=https://github.com/keycloak/keycloak.git GIT_VERSION=${VERSION} diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker index 457c306..a5aef6c 100755 --- a/ressources/metabase/debmaker +++ b/ressources/metabase/debmaker @@ -1,12 +1,12 @@ #!/bin/bash -VERSION=0.47.8 +VERSION=0.49.0 APP=metabase DEPOT=https://github.com/metabase/metabase.git GIT_VERSION=v$VERSION DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bookworm -IMAGE_SIZE=10 +IMAGE_SIZE=14 PACKAGE_DEPENDENCY="build-essential default-jdk curl nodejs yarn" main(){ diff --git a/ressources/vaultwarden/debmaker b/ressources/vaultwarden/debmaker index d6e48ae..49fb3db 100755 --- a/ressources/vaultwarden/debmaker +++ b/ressources/vaultwarden/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.30.1 +VERSION=1.30.5 APP=vaultwarden GIT_VERSION=$VERSION DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) diff --git a/ressources/zigbee2mqtt/debmaker b/ressources/zigbee2mqtt/debmaker index b979388..92046bc 100755 --- a/ressources/zigbee2mqtt/debmaker +++ b/ressources/zigbee2mqtt/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.33.2 +VERSION=1.36.0 APP=zigbee2mqtt DEPOT=https://github.com/Koenkk/zigbee2mqtt.git GIT_VERSION=${VERSION}