diff --git a/lib/function.sh b/lib/function.sh index 83175ae..cb16c0c 100644 --- a/lib/function.sh +++ b/lib/function.sh @@ -84,7 +84,6 @@ debmaker_chroot() { zdebmaker_inject debmaker_mount_proc_sys ${OPEN_FILE} ${MOUNT_PATH}/${APP}/ sudo chroot ${MOUNT_PATH}/${APP}/ - find ${MOUNT_PATH}/${APP}/tmp/dist/ -name *.deb -exec cp -v {} dist/ \; debmaker_umount_proc_sys ${MOUNT_PATH}/${APP}/ } diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker index e00e9ea..499127a 100755 --- a/ressources/adguardhome/debmaker +++ b/ressources/adguardhome/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.108.0-b.42 +VERSION=0.108.0-b.41 APP=adguardhome DEPOT=https://github.com/AdguardTeam/AdGuardHome.git GIT_VERSION=v${VERSION} diff --git a/ressources/babybuddy/debmaker b/ressources/babybuddy/debmaker index 29aa834..1859735 100755 --- a/ressources/babybuddy/debmaker +++ b/ressources/babybuddy/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.0.3 +VERSION=2.0.1 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 c386034..fd796ea 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_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 +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' #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 46fd755..b2dc05f 100755 --- a/ressources/budibase/debmaker +++ b/ressources/budibase/debmaker @@ -1,13 +1,13 @@ #!/bin/bash -VERSION=2.8.28 +VERSION=2.3.21 APP=budibase DEPOT=https://github.com/Budibase/budibase.git -GIT_VERSION=${VERSION} +GIT_VERSION=v${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=20 -PACKAGE_DEPENDENCY="yarn nodejs build-essential" +PACKAGE_DEPENDENCY="yarn nodejs" main(){ base_package_upgrade @@ -17,31 +17,30 @@ main(){ makedeb } -envinit(){ +envinit() { configure_depot_yarn - configure_depot_nodejs 16 + configure_depot_nodejs 18 install_package_dependency } build() { cd /tmp/${APP} - npm install -g yarn jest lerna husky --force + npm install -g yarn jest lerna --force yarn - #yarn bootstrap + yarn bootstrap yarn build - + rm -fr /tmp/${APP}/packages/*/build } makedeb(){ PATH_DEB=/tmp/src/rootfs - 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 + 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 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 d512095..06b9d4f 100755 --- a/ressources/clouseau/debmaker +++ b/ressources/clouseau/debmaker @@ -1,13 +1,13 @@ #!/bin/bash -VERSION=2.21.6 +VERSION=2.21.1 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=bookworm +DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=3 -PACKAGE_DEPENDENCY="software-properties-common erlang mvn" +PACKAGE_DEPENDENCY="software-properties-common erlang" main(){ envinit @@ -19,12 +19,12 @@ main(){ envinit() { base_package_upgrade install_package_dependency - 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-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9 + apt-add-repository 'deb http://repos.azulsystems.com/debian stable main' apt-get update apt-get install -y --no-install-recommends zulu-7 mkdir -p /usr/share/maven - 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 + 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 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 de4459b..e24663f 100755 --- a/ressources/element-web/debmaker +++ b/ressources/element-web/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.11.36 +VERSION=1.11.33 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 bfd0693..96af513 100755 --- a/ressources/forgejo/debmaker +++ b/ressources/forgejo/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.20.1-0 +VERSION=1.19.3-0 APP=forgejo DEPOT=https://codeberg.org/forgejo/forgejo GIT_VERSION=v${VERSION} diff --git a/ressources/gotify/debmaker b/ressources/gotify/debmaker index 2885d40..ed993a6 100755 --- a/ressources/gotify/debmaker +++ b/ressources/gotify/debmaker @@ -1,10 +1,10 @@ #!/bin/bash APP=gotify -VERSION=2.3.0 +VERSION=2.2.4 GIT_VERSION=v$VERSION DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) -DEBIAN_VERSION_CODENAME=bookworm +DEBIAN_VERSION_CODENAME=bullseye 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 e2e749d..6aefb83 100755 --- a/ressources/joplin-desktop/debmaker +++ b/ressources/joplin-desktop/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.12.9 +VERSION=2.12.7 APP=joplin-desktop GIT_VERSION=v${VERSION} DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) diff --git a/ressources/keycloak-radius-plugin/README.MD b/ressources/keycloak-radius-plugin/README.MD deleted file mode 100644 index e9a346e..0000000 --- a/ressources/keycloak-radius-plugin/README.MD +++ /dev/null @@ -1,38 +0,0 @@ -#### keycloak - -##### Information - -Site : https://www.keycloak.org/ - -Source : https://github.com/keycloak/keycloak - -##### Install - -```bash -apt install -y wget ca-certificates -wget -qO - https://deb.lgy.fr/install.sh | bash -apt-get update -apt install keycloak - -# edit /etc/default/keycloak -# edit /etc/keycloak/keycloak.conf - -systemctl enable --now keycloak -``` - -##### Configuration - -Create database sample on postgresql - -```SQL -CREATE USER keycloak WITH PASSWORD 'password'; - -CREATE DATABASE "keycloak" -WITH OWNER "keycloak" -ENCODING 'UTF8' -LC_COLLATE = 'fr_FR.UTF-8' -LC_CTYPE = 'fr_FR.UTF-8' -TEMPLATE template0; - -GRANT ALL privileges ON DATABASE keycloak TO keycloak; -``` diff --git a/ressources/keycloak-radius-plugin/debmaker b/ressources/keycloak-radius-plugin/debmaker deleted file mode 100755 index 2358704..0000000 --- a/ressources/keycloak-radius-plugin/debmaker +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -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 - [ -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 -} - -makedeb(){ - PATH_DEB=/tmp/src/rootfs - - mkdir -p ${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-radius-plugin/rootfs/DEBIAN/control b/ressources/keycloak-radius-plugin/rootfs/DEBIAN/control deleted file mode 100644 index cde08fb..0000000 --- a/ressources/keycloak-radius-plugin/rootfs/DEBIAN/control +++ /dev/null @@ -1,8 +0,0 @@ -Package: keycloak-radius-plugin -Version: %VERSION% -Section: contrib -Priority: optional -Architecture: all -Depends: keycloak -Maintainer: Thomas Legay -Description: keycloak radius plugin diff --git a/ressources/keycloak/debmaker b/ressources/keycloak/debmaker index 1ead68e..824ad5c 100755 --- a/ressources/keycloak/debmaker +++ b/ressources/keycloak/debmaker @@ -1,11 +1,11 @@ #!/bin/bash -VERSION=22.0.1 +VERSION=19.0.1 APP=keycloak DEPOT=https://github.com/keycloak/keycloak.git GIT_VERSION=${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) -DEBIAN_VERSION_CODENAME=bookworm +DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=12 PACKAGE_DEPENDENCY="default-jdk maven" @@ -23,19 +23,19 @@ build() { makedeb(){ PATH_DEB=/tmp/src/rootfs - + mkdir -p ${PATH_DEB}/etc/ mkdir -p ${PATH_DEB}/usr/lib/keycloak mkdir -p ${PATH_DEB}/var/lib/ - - tar -zxf /tmp/${APP}/quarkus/dist/target/keycloak-*tar.gz -C ${PATH_DEB}/usr/lib/keycloak --strip-components=1 + + tar -zxf /tmp/${APP}/quarkus/dist/target/keycloak-19.0.1.tar.gz -C ${PATH_DEB}/usr/lib/keycloak --strip-components=1 mv ${PATH_DEB}/usr/lib/keycloak/conf ${PATH_DEB}/etc/keycloak #mv ${PATH_DEB}/usr/lib/keycloak/data ${PATH_DEB}/var/lib/keycloak - + ln -s /etc/keycloak ${PATH_DEB}/usr/lib/keycloak/conf ln -s /var/lib/keycloak ${PATH_DEB}/usr/lib/keycloak/data - + sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist } diff --git a/ressources/kimai2/debmaker b/ressources/kimai2/debmaker index e75fa55..6c825cd 100755 --- a/ressources/kimai2/debmaker +++ b/ressources/kimai2/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.0.29 +VERSION=2.0.28 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 9f315dd..7c50a4f 100755 --- a/ressources/mautrix-whatsapp/debmaker +++ b/ressources/mautrix-whatsapp/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.9.0 +VERSION=0.8.4 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 46f2a3e..37b2329 100755 --- a/ressources/metabase/debmaker +++ b/ressources/metabase/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.46.6.2 +VERSION=0.46.6 APP=metabase DEPOT=https://github.com/metabase/metabase.git GIT_VERSION=v$VERSION @@ -23,7 +23,6 @@ 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 03aaef0..d424fe8 100755 --- a/ressources/minio/debmaker +++ b/ressources/minio/debmaker @@ -1,11 +1,11 @@ #!/bin/bash -VERSION=RELEASE.2023-07-21T21-12-44Z +VERSION=RELEASE.2023-01-20T02-05-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=bookworm +DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=5 PACKAGE_DEPENDENCY="build-essential" diff --git a/ressources/rustdesk-server/debmaker b/ressources/rustdesk-server/debmaker index 0d79ff4..5a08e33 100755 --- a/ressources/rustdesk-server/debmaker +++ b/ressources/rustdesk-server/debmaker @@ -1,7 +1,7 @@ #!/bin/bash APP=rustdesk-server -VERSION=1.1.8-1 +VERSION=1.1.8 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 f2cf88f..f71e3e3 100755 --- a/ressources/vaultwarden/debmaker +++ b/ressources/vaultwarden/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.29.1 +VERSION=1.29.0 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 f13d49f..d8dd155 100755 --- a/ressources/wallabag/debmaker +++ b/ressources/wallabag/debmaker @@ -1,10 +1,10 @@ #!/bin/bash -VERSION=2.6.1 +VERSION=2.5.4 APP=wallabag GIT_VERSION=$VERSION DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) -DEBIAN_VERSION_CODENAME=bookworm +DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=4 DEPOT=https://github.com/wallabag/wallabag.git @@ -20,10 +20,10 @@ main(){ envinit() { configure_depot_yarn - configure_depot_nodejs 18 + configure_depot_nodejs install_package_dependency cd /opt/ - wget https://getcomposer.org/download/2.5.8/composer.phar -O /opt/composer.phar + wget https://getcomposer.org/download/2.2.13/composer.phar -O /opt/composer.phar } build() {