New version adguardhome authelia element-web gitea glpi joplin mautrix-whatsapp metabase vaultwarden-web vaultwarden wallabag

This commit is contained in:
thomas 2022-05-26 16:27:16 +02:00
parent ebdea0727b
commit ad8ebb543c
13 changed files with 83 additions and 78 deletions

View File

@ -45,7 +45,8 @@ zdebmaker_createAppOS(){
zdebmaker_inject(){ zdebmaker_inject(){
zdebmaker_getDep zdebmaker_getDep
sudo mount cache/${APP} ${MOUNT_PATH}/${APP}/ 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/ [ -d ${MOUNT_PATH}/${APP}/tmp/src ] && sudo rm -rf ${MOUNT_PATH}/${APP}/tmp/src/
sudo mkdir -p ${MOUNT_PATH}/${APP}/tmp/src sudo mkdir -p ${MOUNT_PATH}/${APP}/tmp/src
sudo cp -pfr ressources/${APP}/* ${MOUNT_PATH}/${APP}/tmp/src sudo cp -pfr ressources/${APP}/* ${MOUNT_PATH}/${APP}/tmp/src
@ -93,7 +94,8 @@ debmaker_run(){
do do
sudo chroot ${MOUNT_PATH}/${APP}/ /tmp/src/exec_in_chroot.sh ${CURRENT_STEP} sudo chroot ${MOUNT_PATH}/${APP}/ /tmp/src/exec_in_chroot.sh ${CURRENT_STEP}
done 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}/ debmaker_umount_proc_sys ${MOUNT_PATH}/${APP}/
} }

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
VERSION=0.108.0-b.7 VERSION=0.108.0-b.8
[ -e ./lib/function.sh ] && source ./lib/function.sh [ -e ./lib/function.sh ] && source ./lib/function.sh
@ -14,25 +14,19 @@ STEP="envinit prebuild build makedeb"
envinit() { envinit() {
apt-get update apt-get update
if [ $(dpkg -l | grep -e 'ii nodejs ' | wc -l) -eq 1 ]; apt-get dist-upgrade -y
then apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot
apt-get dist-upgrade -y wget -qO - https://deb.nodesource.com/setup_16.x | bash
else wget -qO - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor > /usr/share/keyrings/yarnkey.gpg
apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot 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://deb.nodesource.com/setup_16.x | bash apt-get update
wget -qO - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor > /usr/share/keyrings/yarnkey.gpg apt-get install -y nodejs yarn
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://go.dev/dl/go1.18.linux-amd64.tar.gz | tar -C /usr/local -xz
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
} }
prebuild(){ prebuild(){
[ -e /tmp/git ] && rm -fr /tmp/git [ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
[ -e /tmp/${APP} ] || mkdir /tmp/${APP} git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP}
git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/git
cp -r /tmp/git/. /tmp/${APP}
} }
build() { build() {

View File

@ -1,14 +1,13 @@
#!/bin/bash #!/bin/bash
VERSION=4.35.0 VERSION=4.35.6
RELEASE=1
[ -e ./lib/function.sh ] && source ./lib/function.sh [ -e ./lib/function.sh ] && source ./lib/function.sh
APP=authelia APP=authelia
DEPOT=https://github.com/authelia/authelia.git DEPOT=https://github.com/authelia/authelia.git
GIT_VERSION=v${VERSION} GIT_VERSION=v${VERSION}
DEB_VERSION=${VERSION}-${RELEASE} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
DEBIAN_VERSION_CODENAME=bullseye DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=4 IMAGE_SIZE=4
@ -26,10 +25,8 @@ envinit() {
} }
prebuild(){ prebuild(){
[ -e /tmp/git ] && rm -fr /tmp/git [ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
[ -e /tmp/${APP} ] || mkdir /tmp/${APP} git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP}
git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/git
cp -r /tmp/git/. /tmp/${APP}
} }
build() { build() {

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
VERSION=1.10.11 VERSION=1.10.13
[ -e ./lib/function.sh ] && source ./lib/function.sh [ -e ./lib/function.sh ] && source ./lib/function.sh

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
VERSION=1.16.7 VERSION=1.16.8
[ -e ./lib/function.sh ] && source ./lib/function.sh [ -e ./lib/function.sh ] && source ./lib/function.sh

View File

@ -7,7 +7,7 @@ VERSION=10.0.0
APP=glpi APP=glpi
DEPOT=https://github.com/glpi-project/glpi.git DEPOT=https://github.com/glpi-project/glpi.git
GIT_VERSION=${VERSION} 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 DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=4 IMAGE_SIZE=4

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
GIT_VERSION=v2.8.6 GIT_VERSION=v2.8.8
DEB_VERSION_DESKTOP=2.8.6-$(date +%Y%m%d%H%M) DEB_VERSION_DESKTOP=2.8.8-$(date +%Y%m%d%H%M)
DEB_VERSION_SERVER=2.7.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 [ -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 APP=joplin
DEPOT=https://github.com/laurent22/joplin.git DEPOT=https://github.com/laurent22/joplin.git
DEBIAN_VERSION_CODENAME=bullseye DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=12 IMAGE_SIZE=14
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { envinit() {
apt-get update apt-get update
if [ $(dpkg -l | grep -e 'ii build-essential ' | wc -l) -eq 1 ]; if [ $(dpkg -l | grep -e 'ii build-essential ' | wc -l) -eq 1 ];
then then
apt-get dist-upgrade -y apt-get dist-upgrade -y
else else
apt install -y --no-install-recommends build-essential git python wget ca-certificates rsync fakeroot dpkg apt install -y --no-install-recommends build-essential git python wget ca-certificates rsync fakeroot dpkg
@ -28,7 +28,7 @@ envinit() {
fi fi
} }
prebuild(){ prebuild(){
[ -e /tmp/git ] && rm -fr /tmp/git [ -e /tmp/git ] && rm -fr /tmp/git
[ -e /tmp/${APP} ] || mkdir /tmp/${APP} [ -e /tmp/${APP} ] || mkdir /tmp/${APP}
git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/git git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/git

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
VERSION=0.3.1 VERSION=0.4.0
[ -e ./lib/function.sh ] && source ./lib/function.sh [ -e ./lib/function.sh ] && source ./lib/function.sh

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
VERSION=0.42.4 VERSION=0.43.1
[ -e ./lib/function.sh ] && source ./lib/function.sh [ -e ./lib/function.sh ] && source ./lib/function.sh

View File

@ -3,27 +3,30 @@
[ -e ./lib/function.sh ] && source ./lib/function.sh [ -e ./lib/function.sh ] && source ./lib/function.sh
APP=vaultwarden-web APP=vaultwarden-web
VERSION=2.25.1 VERSION=2.28.1
GIT_VERSION=v$VERSION GIT_VERSION=v$VERSION
DEB_VERSION=$VERSION-2 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
DEBIAN_VERSION_CODENAME=bullseye DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE= IMAGE_SIZE=
DEPOT=https://github.com/bitwarden/web.git
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { envinit() {
apt-get update
apt-get dist-upgrade -y
apt install -y --no-install-recommends wget fakeroot dpkg ca-certificates build-essential git python 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 wget -qO - https://deb.nodesource.com/setup_16.x | bash
apt-get update apt-get update
apt-get install -y nodejs apt-get install -y nodejs
apt clean
} }
prebuild(){ prebuild(){
GIT_VERSION=$1 [ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP}
GIT_VERSION=$1 cd /tmp/${APP}
git clone --depth 1 -b ${GIT_VERSION} https://github.com/bitwarden/web.git /tmp/web-vault
cd /tmp/web-vault
git submodule update --init --recursive git submodule update --init --recursive
cd .. cd ..
@ -34,22 +37,20 @@ prebuild(){
PATCH_FILE=$(ls patches/ | sort -V | tail -n 1) PATCH_FILE=$(ls patches/ | sort -V | tail -n 1)
cp patches/${PATCH_FILE} ../web-vault/ cp patches/${PATCH_FILE} ../web-vault/
cd /tmp/web-vault /tmp/${APP}
git apply ${PATCH_FILE} git apply ${PATCH_FILE}
} }
build() { build() {
cd /tmp/web-vault cd /tmp/${APP}
npm install npm install
npm run dist:oss:selfhost npm run dist:oss:selfhost
} }
makedeb(){ makedeb(){
GIT_VERSION=$1
DEB_VERSION=$2
PATH_DEB=/tmp/src/rootfs 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 sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
} }

View File

@ -3,40 +3,40 @@
[ -e ./lib/function.sh ] && source ./lib/function.sh [ -e ./lib/function.sh ] && source ./lib/function.sh
APP=vaultwarden APP=vaultwarden
VERSION=1.24.0 VERSION=1.25.0
GIT_VERSION=$VERSION GIT_VERSION=$VERSION
DEB_VERSION=$VERSION-1 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
DEBIAN_VERSION_CODENAME=bullseye DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=6 IMAGE_SIZE=8
DEPOT=https://github.com/dani-garcia/vaultwarden.git
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { envinit() {
apt install -y --no-install-recommends build-essential git wget fakeroot dpkg ca-certificates libmariadb-dev libpq-dev pkg-config libmysql++-dev apt-get update
cd /tmp 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 wget -qO - https://sh.rustup.rs > rustup
bash rustup -qy bash rustup -qy
apt clean apt clean
} }
prebuild(){ prebuild(){
GIT_VERSION=$1 [ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
git clone --depth 1 -b ${GIT_VERSION} https://github.com/dani-garcia/vaultwarden.git /tmp/vaultwarden git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP}
} }
build() { build() {
cd /tmp/vaultwarden/ cd /tmp/${APP}
source ~/.cargo/env source ~/.cargo/env
cargo build --features sqlite,mysql,postgresql --release cargo build --features sqlite,mysql,postgresql --release
} }
makedeb(){ makedeb(){
GIT_VERSION=$1
DEB_VERSION=$2
PATH_DEB=/tmp/src/rootfs 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 sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
} }

View File

@ -3,47 +3,56 @@
[ -e ./lib/function.sh ] && source ./lib/function.sh [ -e ./lib/function.sh ] && source ./lib/function.sh
APP=wallabag APP=wallabag
VERSION=2.4.3 VERSION=2.5.0
GIT_VERSION=$VERSION GIT_VERSION=$VERSION
DEB_VERSION=$VERSION-3 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
DEBIAN_VERSION_CODENAME=bullseye DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=2 IMAGE_SIZE=4
DEPOT=https://github.com/wallabag/wallabag.git
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { 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(){ prebuild(){
GIT_VERSION=$1 [ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
git clone --depth 1 -b ${GIT_VERSION} https://github.com/wallabag/wallabag.git /tmp/wallabag git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP}
cd /tmp/${APP}
wget https://getcomposer.org/download/2.2.13/composer.phar
} }
build() { build() {
cd /tmp/wallabag cd /tmp/${APP}
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist -n --no-scripts SYMFONY_ENV=prod php composer.phar install --no-dev -o --prefer-dist -n --no-scripts
ENV=PROD make build
} }
makedeb(){ makedeb(){
GIT_VERSION=$1
DEB_VERSION=$2
PATH_DEB=/tmp/src/rootfs PATH_DEB=/tmp/src/rootfs
cp -fr /tmp/wallabag/app ${PATH_DEB}/usr/share/wallabag/app cp -fr /tmp/${APP}/app ${PATH_DEB}/usr/share/wallabag/app
cp -fr /tmp/wallabag/src ${PATH_DEB}/usr/share/wallabag/src cp -fr /tmp/${APP}/src ${PATH_DEB}/usr/share/wallabag/src
cp -fr /tmp/wallabag/vendor ${PATH_DEB}/usr/share/wallabag/vendor cp -fr /tmp/${APP}/vendor ${PATH_DEB}/usr/share/wallabag/vendor
cp -fr /tmp/wallabag/web ${PATH_DEB}/usr/share/wallabag/web 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 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/${APP}/data ${PATH_DEB}/var/lib/wallabag/data
cp -fr /tmp/wallabag/var ${PATH_DEB}/var/lib/wallabag/var 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 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/${APP}/data ${PATH_DEB}/usr/share/wallabag/data
ln -s /var/lib/wallabag/var ${PATH_DEB}/usr/share/wallabag/var ln -s /var/lib/${APP}/var ${PATH_DEB}/usr/share/wallabag/var
ln -s /etc/wallabag/parameters.yml ${PATH_DEB}/usr/share/wallabag/app/config/parameters.yml 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 sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
} }

View File

@ -1,2 +1,4 @@
#!/bin/bash #!/bin/bash
chown -R www-data:www-data /var/lib/wallabag/ chown -R www-data:www-data /var/lib/wallabag/
[ -e /var/lib/wallabag/var/cache/ ] && rm -fr /var/lib/wallabag/var/cache/