From ad8ebb543c1079429e6a9c17ddcf2a31acd856e2 Mon Sep 17 00:00:00 2001 From: thomas Date: Thu, 26 May 2022 16:27:16 +0200 Subject: [PATCH] New version adguardhome authelia element-web gitea glpi joplin mautrix-whatsapp metabase vaultwarden-web vaultwarden wallabag --- lib/function.sh | 6 ++- ressources/adguardhome/debmaker | 28 +++++-------- ressources/authelia/debmaker | 11 ++--- ressources/element-web/debmaker | 2 +- ressources/gitea/debmaker | 2 +- ressources/glpi/debmaker | 2 +- ressources/joplin/debmaker | 10 ++--- ressources/mautrix-whatsapp/debmaker | 2 +- ressources/metabase/debmaker | 2 +- ressources/vaultwarden-web/debmaker | 23 ++++++----- ressources/vaultwarden/debmaker | 24 +++++------ ressources/wallabag/debmaker | 47 +++++++++++++--------- ressources/wallabag/rootfs/DEBIAN/postinst | 2 + 13 files changed, 83 insertions(+), 78 deletions(-) diff --git a/lib/function.sh b/lib/function.sh index 1bbd38c..14f7345 100644 --- a/lib/function.sh +++ b/lib/function.sh @@ -45,7 +45,8 @@ zdebmaker_createAppOS(){ zdebmaker_inject(){ zdebmaker_getDep sudo mount cache/${APP} ${MOUNT_PATH}/${APP}/ - [ -d ${MOUNT_PATH}/${APP}/tmp/dist ] || sudo mkdir ${MOUNT_PATH}/${APP}/tmp/dist/ + [ -d ${MOUNT_PATH}/${APP}/tmp/dist ] && sudo rm -fr ${MOUNT_PATH}/${APP}/tmp/dist/ + sudo mkdir ${MOUNT_PATH}/${APP}/tmp/dist/ [ -d ${MOUNT_PATH}/${APP}/tmp/src ] && sudo rm -rf ${MOUNT_PATH}/${APP}/tmp/src/ sudo mkdir -p ${MOUNT_PATH}/${APP}/tmp/src sudo cp -pfr ressources/${APP}/* ${MOUNT_PATH}/${APP}/tmp/src @@ -93,7 +94,8 @@ debmaker_run(){ do sudo chroot ${MOUNT_PATH}/${APP}/ /tmp/src/exec_in_chroot.sh ${CURRENT_STEP} done - find ${MOUNT_PATH}/${APP}/tmp/dist/ -name *.deb -exec cp {} dist/ \; + rm -fr dist/${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 929b9a4..4c1aa58 100755 --- a/ressources/adguardhome/debmaker +++ b/ressources/adguardhome/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.108.0-b.7 +VERSION=0.108.0-b.8 [ -e ./lib/function.sh ] && source ./lib/function.sh @@ -14,25 +14,19 @@ STEP="envinit prebuild build makedeb" envinit() { apt-get update - if [ $(dpkg -l | grep -e 'ii nodejs ' | wc -l) -eq 1 ]; - then - apt-get dist-upgrade -y - else - apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot - wget -qO - https://deb.nodesource.com/setup_16.x | bash - wget -qO - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor > /usr/share/keyrings/yarnkey.gpg - echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" > /etc/apt/sources.list.d/yarn.list - apt-get update - apt-get install -y nodejs yarn - wget -qO - https://go.dev/dl/go1.18.linux-amd64.tar.gz | tar -C /usr/local -xz - fi + apt-get dist-upgrade -y + apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot + wget -qO - https://deb.nodesource.com/setup_16.x | bash + wget -qO - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor > /usr/share/keyrings/yarnkey.gpg + echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" > /etc/apt/sources.list.d/yarn.list + apt-get update + apt-get install -y nodejs yarn + wget -qO - https://go.dev/dl/go1.18.linux-amd64.tar.gz | tar -C /usr/local -xz } prebuild(){ - [ -e /tmp/git ] && rm -fr /tmp/git - [ -e /tmp/${APP} ] || mkdir /tmp/${APP} - git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/git - cp -r /tmp/git/. /tmp/${APP} + [ -e /tmp/${APP} ] && rm -fr /tmp/${APP} + git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP} } build() { diff --git a/ressources/authelia/debmaker b/ressources/authelia/debmaker index 68ad630..4f01c31 100755 --- a/ressources/authelia/debmaker +++ b/ressources/authelia/debmaker @@ -1,14 +1,13 @@ #!/bin/bash -VERSION=4.35.0 -RELEASE=1 +VERSION=4.35.6 [ -e ./lib/function.sh ] && source ./lib/function.sh APP=authelia DEPOT=https://github.com/authelia/authelia.git GIT_VERSION=v${VERSION} -DEB_VERSION=${VERSION}-${RELEASE} +DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=4 @@ -26,10 +25,8 @@ envinit() { } prebuild(){ - [ -e /tmp/git ] && rm -fr /tmp/git - [ -e /tmp/${APP} ] || mkdir /tmp/${APP} - git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/git - cp -r /tmp/git/. /tmp/${APP} + [ -e /tmp/${APP} ] && rm -fr /tmp/${APP} + git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP} } build() { diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker index e3983b4..1435c41 100755 --- a/ressources/element-web/debmaker +++ b/ressources/element-web/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.10.11 +VERSION=1.10.13 [ -e ./lib/function.sh ] && source ./lib/function.sh diff --git a/ressources/gitea/debmaker b/ressources/gitea/debmaker index 3383c9f..8ef7d4a 100755 --- a/ressources/gitea/debmaker +++ b/ressources/gitea/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.16.7 +VERSION=1.16.8 [ -e ./lib/function.sh ] && source ./lib/function.sh diff --git a/ressources/glpi/debmaker b/ressources/glpi/debmaker index b8960e1..8de11c2 100755 --- a/ressources/glpi/debmaker +++ b/ressources/glpi/debmaker @@ -7,7 +7,7 @@ VERSION=10.0.0 APP=glpi DEPOT=https://github.com/glpi-project/glpi.git GIT_VERSION=${VERSION} -DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) +DEB_VERSION=10.0.1-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=4 diff --git a/ressources/joplin/debmaker b/ressources/joplin/debmaker index 5097ff0..d66ccb6 100755 --- a/ressources/joplin/debmaker +++ b/ressources/joplin/debmaker @@ -1,7 +1,7 @@ #!/bin/bash -GIT_VERSION=v2.8.6 -DEB_VERSION_DESKTOP=2.8.6-$(date +%Y%m%d%H%M) +GIT_VERSION=v2.8.8 +DEB_VERSION_DESKTOP=2.8.8-$(date +%Y%m%d%H%M) DEB_VERSION_SERVER=2.7.8-$(date +%Y%m%d%H%M) [ -e ./lib/function.sh ] && source ./lib/function.sh @@ -9,14 +9,14 @@ DEB_VERSION_SERVER=2.7.8-$(date +%Y%m%d%H%M) APP=joplin DEPOT=https://github.com/laurent22/joplin.git DEBIAN_VERSION_CODENAME=bullseye -IMAGE_SIZE=12 +IMAGE_SIZE=14 STEP="envinit prebuild build makedeb" envinit() { apt-get update if [ $(dpkg -l | grep -e 'ii build-essential ' | wc -l) -eq 1 ]; - then + then apt-get dist-upgrade -y else apt install -y --no-install-recommends build-essential git python wget ca-certificates rsync fakeroot dpkg @@ -28,7 +28,7 @@ envinit() { fi } -prebuild(){ +prebuild(){ [ -e /tmp/git ] && rm -fr /tmp/git [ -e /tmp/${APP} ] || mkdir /tmp/${APP} git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/git diff --git a/ressources/mautrix-whatsapp/debmaker b/ressources/mautrix-whatsapp/debmaker index 9409870..2f51f1e 100755 --- a/ressources/mautrix-whatsapp/debmaker +++ b/ressources/mautrix-whatsapp/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.3.1 +VERSION=0.4.0 [ -e ./lib/function.sh ] && source ./lib/function.sh diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker index 1dbc164..70c5c0a 100755 --- a/ressources/metabase/debmaker +++ b/ressources/metabase/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.42.4 +VERSION=0.43.1 [ -e ./lib/function.sh ] && source ./lib/function.sh diff --git a/ressources/vaultwarden-web/debmaker b/ressources/vaultwarden-web/debmaker index cf22a8e..290d11b 100755 --- a/ressources/vaultwarden-web/debmaker +++ b/ressources/vaultwarden-web/debmaker @@ -3,27 +3,30 @@ [ -e ./lib/function.sh ] && source ./lib/function.sh APP=vaultwarden-web -VERSION=2.25.1 +VERSION=2.28.1 GIT_VERSION=v$VERSION -DEB_VERSION=$VERSION-2 +DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE= +DEPOT=https://github.com/bitwarden/web.git STEP="envinit prebuild build makedeb" envinit() { + apt-get update + apt-get dist-upgrade -y apt install -y --no-install-recommends wget fakeroot dpkg ca-certificates build-essential git python wget -qO - https://deb.nodesource.com/setup_16.x | bash apt-get update apt-get install -y nodejs + apt clean } prebuild(){ - GIT_VERSION=$1 + [ -e /tmp/${APP} ] && rm -fr /tmp/${APP} + git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP} - GIT_VERSION=$1 - git clone --depth 1 -b ${GIT_VERSION} https://github.com/bitwarden/web.git /tmp/web-vault - cd /tmp/web-vault + cd /tmp/${APP} git submodule update --init --recursive cd .. @@ -34,22 +37,20 @@ prebuild(){ PATCH_FILE=$(ls patches/ | sort -V | tail -n 1) cp patches/${PATCH_FILE} ../web-vault/ - cd /tmp/web-vault + /tmp/${APP} git apply ${PATCH_FILE} } build() { - cd /tmp/web-vault + cd /tmp/${APP} npm install npm run dist:oss:selfhost } makedeb(){ - GIT_VERSION=$1 - DEB_VERSION=$2 PATH_DEB=/tmp/src/rootfs - cp -fr /tmp/web-vault/build/* ${PATH_DEB}/usr/share/vaultwarden-web + cp -fr /tmp/${APP}/build/* ${PATH_DEB}/usr/share/vaultwarden-web sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist } diff --git a/ressources/vaultwarden/debmaker b/ressources/vaultwarden/debmaker index 87dd3d1..3ce13da 100755 --- a/ressources/vaultwarden/debmaker +++ b/ressources/vaultwarden/debmaker @@ -3,40 +3,40 @@ [ -e ./lib/function.sh ] && source ./lib/function.sh APP=vaultwarden -VERSION=1.24.0 +VERSION=1.25.0 GIT_VERSION=$VERSION -DEB_VERSION=$VERSION-1 +DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye -IMAGE_SIZE=6 - +IMAGE_SIZE=8 +DEPOT=https://github.com/dani-garcia/vaultwarden.git STEP="envinit prebuild build makedeb" envinit() { - apt install -y --no-install-recommends build-essential git wget fakeroot dpkg ca-certificates libmariadb-dev libpq-dev pkg-config libmysql++-dev - cd /tmp + apt-get update + apt-get dist-upgrade -y + apt install -y --no-install-recommends build-essential git wget fakeroot dpkg ca-certificates libmariadb-dev libpq-dev pkg-config libmysql++-dev + cd /tmp wget -qO - https://sh.rustup.rs > rustup bash rustup -qy apt clean } prebuild(){ - GIT_VERSION=$1 - git clone --depth 1 -b ${GIT_VERSION} https://github.com/dani-garcia/vaultwarden.git /tmp/vaultwarden + [ -e /tmp/${APP} ] && rm -fr /tmp/${APP} + git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP} } build() { - cd /tmp/vaultwarden/ + cd /tmp/${APP} source ~/.cargo/env cargo build --features sqlite,mysql,postgresql --release } makedeb(){ - GIT_VERSION=$1 - DEB_VERSION=$2 PATH_DEB=/tmp/src/rootfs - cp -fr /tmp/vaultwarden/target/release/vaultwarden ${PATH_DEB}/usr/lib/vaultwarden/ + cp -fr /tmp/${APP}/target/release/vaultwarden ${PATH_DEB}/usr/lib/vaultwarden/ sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist } diff --git a/ressources/wallabag/debmaker b/ressources/wallabag/debmaker index 51cdf46..aeef42b 100755 --- a/ressources/wallabag/debmaker +++ b/ressources/wallabag/debmaker @@ -3,47 +3,56 @@ [ -e ./lib/function.sh ] && source ./lib/function.sh APP=wallabag -VERSION=2.4.3 +VERSION=2.5.0 GIT_VERSION=$VERSION -DEB_VERSION=$VERSION-3 +DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye -IMAGE_SIZE=2 +IMAGE_SIZE=4 +DEPOT=https://github.com/wallabag/wallabag.git STEP="envinit prebuild build makedeb" envinit() { - apt-get install -y --no-install-recommends wget ca-certificates composer git php-common php-xml php-json php-gd php-mbstring php-xml php-tidy php-curl php-tokenizer php-bcmath php-intl php-fpm unzip fakeroot dpkg + apt-get update + apt-get dist-upgrade -y + apt-get install -y --no-install-recommends wget ca-certificates git php-common php-xml php-json php-gd php-mbstring php-xml php-tidy php-curl php-tokenizer php-bcmath php-intl php-fpm unzip fakeroot dpkg gpg make + echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" > /etc/apt/sources.list.d/yarn.list + wget https://dl.yarnpkg.com/debian/pubkey.gpg -O - | gpg --dearmor > /usr/share/keyrings/yarnkey.gpg + apt-get update + apt-get install yarn -y } prebuild(){ - GIT_VERSION=$1 - git clone --depth 1 -b ${GIT_VERSION} https://github.com/wallabag/wallabag.git /tmp/wallabag + [ -e /tmp/${APP} ] && rm -fr /tmp/${APP} + git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP} + cd /tmp/${APP} + wget https://getcomposer.org/download/2.2.13/composer.phar } build() { - cd /tmp/wallabag - SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist -n --no-scripts + cd /tmp/${APP} + SYMFONY_ENV=prod php composer.phar install --no-dev -o --prefer-dist -n --no-scripts + ENV=PROD make build } makedeb(){ - GIT_VERSION=$1 - DEB_VERSION=$2 PATH_DEB=/tmp/src/rootfs - cp -fr /tmp/wallabag/app ${PATH_DEB}/usr/share/wallabag/app - cp -fr /tmp/wallabag/src ${PATH_DEB}/usr/share/wallabag/src - cp -fr /tmp/wallabag/vendor ${PATH_DEB}/usr/share/wallabag/vendor - cp -fr /tmp/wallabag/web ${PATH_DEB}/usr/share/wallabag/web + cp -fr /tmp/${APP}/app ${PATH_DEB}/usr/share/wallabag/app + cp -fr /tmp/${APP}/src ${PATH_DEB}/usr/share/wallabag/src + cp -fr /tmp/${APP}/vendor ${PATH_DEB}/usr/share/wallabag/vendor + cp -fr /tmp/${APP}/web ${PATH_DEB}/usr/share/wallabag/web + cp -fr /tmp/${APP}/bin ${PATH_DEB}/usr/share/wallabag/bin echo need by synfony to find project directory > ${PATH_DEB}/usr/share/wallabag/composer.json - cp -fr /tmp/wallabag/data ${PATH_DEB}/var/lib/wallabag/data - cp -fr /tmp/wallabag/var ${PATH_DEB}/var/lib/wallabag/var + cp -fr /tmp/${APP}/data ${PATH_DEB}/var/lib/wallabag/data + cp -fr /tmp/${APP}/var ${PATH_DEB}/var/lib/wallabag/var cp /tmp/wallabag/app/config/parameters.yml.dist ${PATH_DEB}/etc/wallabag/parameters.yml - ln -s /var/lib/wallabag/data ${PATH_DEB}/usr/share/wallabag/data - ln -s /var/lib/wallabag/var ${PATH_DEB}/usr/share/wallabag/var - ln -s /etc/wallabag/parameters.yml ${PATH_DEB}/usr/share/wallabag/app/config/parameters.yml + ln -s /var/lib/${APP}/data ${PATH_DEB}/usr/share/wallabag/data + ln -s /var/lib/${APP}/var ${PATH_DEB}/usr/share/wallabag/var + ln -s /etc/${APP}/parameters.yml ${PATH_DEB}/usr/share/wallabag/app/config/parameters.yml sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist } diff --git a/ressources/wallabag/rootfs/DEBIAN/postinst b/ressources/wallabag/rootfs/DEBIAN/postinst index 7333c37..70e7bac 100755 --- a/ressources/wallabag/rootfs/DEBIAN/postinst +++ b/ressources/wallabag/rootfs/DEBIAN/postinst @@ -1,2 +1,4 @@ #!/bin/bash chown -R www-data:www-data /var/lib/wallabag/ + +[ -e /var/lib/wallabag/var/cache/ ] && rm -fr /var/lib/wallabag/var/cache/