new version

lib/exec_in_chroot.sh

@@ -38,7 +38,7 @@ configure_depot_nodejs() {
 }
 
 install_go() {
-        GO_VERSION=1.20.5
+        GO_VERSION=1.20.6
         [ ! "$1" == "" ] && GO_VERSION=$1
         PATH=$PATH:/usr/local/go/bin
         if [ ! "$(go version)" == "go version go${GO_VERSION} linux/amd64" ] ;
@@ -57,6 +57,12 @@ install_clojure() {
 	wget -qO - https://download.clojure.org/install/linux-install-1.11.1.1155.sh | bash
 }
 
+install_composer(){
+	wget https://getcomposer.org/installer -O /tmp/installer
+	php /tmp/installer
+	php composer-setup.php --install-dir=/usr/bin
+	rm /tmp/installer
+}
 
 minimum_package() {
 	base_package_upgrade

lib/function.sh

@@ -30,7 +30,8 @@ zdebmaker_createAppOS(){
 	[ -f cache/${DEBIAN_VERSION_CODENAME} ] || zdebmaker_createOS
 
 	[ "${IMAGE_SIZE}" == "" ] && IMAGE_SIZE=2
-	dd if=/dev/zero of=cache/${APP}.tmp bs=1G count=${IMAGE_SIZE}
+#	dd if=/dev/zero of=cache/${APP}.tmp bs=1G count=${IMAGE_SIZE}
+	truncate -s ${IMAGE_SIZE}G cache/${APP}.tmp
 	sudo mkfs.ext4 cache/${APP}.tmp
 
 	[ -d ${MOUNT_PATH}/${APP}/ ] || sudo mkdir -p ${MOUNT_PATH}/${APP}/

ressources/babybuddy/debmaker

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2.0.3
+VERSION=2.0.4
 APP=babybuddy
 DEPOT=https://github.com/babybuddy/babybuddy.git
 GIT_VERSION=v${VERSION}

ressources/budibase/debmaker

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2.8.28
+VERSION=2.8.29
 APP=budibase
 DEPOT=https://github.com/Budibase/budibase.git
 GIT_VERSION=${VERSION}
@@ -23,6 +23,51 @@ envinit(){
 	install_package_dependency
 }
 
+
+build() {
+	cd /tmp/${APP}
+	
+	[ -e /opt/budibase ] && rm -fr /opt/budibase
+	KEEP="dist|package.json|yarn.lock|client|builder|build"
+	npm install -g yarn jest lerna husky --force
+	mkdir -p /opt/budibase/node_modules 
+	
+	cp -fr /tmp/${APP}/packages/server /opt/budibase
+	cp -fr /tmp/${APP}/packages/worker /opt/budibase
+	
+	cp -fr /tmp/${APP}/packages/builder/ /opt/budibase/server
+	cp -fr /tmp/${APP}/packages/client/ /opt/budibase/server
+	
+	cp -fr /tmp/${APP}/yarn.lock /opt/budibase/
+
+
+	ln -s /opt/budibase/node_modules /opt/budibase/server/node_modules
+	ln -s /opt/budibase/node_modules /opt/budibase/worker/node_modules
+	
+	cd /opt/budibase/server
+	sed "s/\"0.0.0\"/\"${VERSION}\"/" -i package.json
+	yarn install --production=true
+	yarn build 
+
+	cd /opt/budibase/worker
+	sed "s/\"0.0.0\"/\"${VERSION}\"/" -i package.json
+	yarn install --production=true
+	yarn build 
+	
+	#rm -fr /opt/budibase/node_modules
+	#mkdir -p /opt/budibase/node_modules
+	
+	#cd /opt/budibase/server
+	#ls | egrep -v $KEEP | xargs rm -rfv
+	#ln -s /opt/budibase/node_modules /opt/budibase/worker/node_modules
+	#NODE_ENV=production yarn
+	#
+	#cd /opt/budibase/worker
+	#ls | egrep -v $KEEP | xargs rm -rfv
+	#ln -s /opt/budibase/node_modules /opt/budibase/server/node_modules
+	#NODE_ENV=production yarn
+}
+
 build() {
 	cd /tmp/${APP}
 	npm install -g yarn jest lerna husky --force
@@ -33,13 +78,27 @@ 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" /tmp/${APP}/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 "process.env" /tmp/${APP}/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/
+	mv /opt/ ${PATH_DEB}/
+
+	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
+	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
+}
+
+
+makedeb(){
+	PATH_DEB=/tmp/src/rootfs
+
+	grep "process.env" /tmp/${APP}/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" /tmp/${APP}/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
@@ -49,3 +108,4 @@ makedeb(){
 	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
 }
+

ressources/joplin-desktop/debmaker

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2.12.9
+VERSION=2.12.10
 APP=joplin-desktop
 GIT_VERSION=v${VERSION}
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)

ressources/metabase/debmaker

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=0.46.6.2
+VERSION=0.46.6.4
 APP=metabase
 DEPOT=https://github.com/metabase/metabase.git
 GIT_VERSION=v$VERSION

ressources/wallabag/debmaker

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2.6.1
+VERSION=2.6.2
 APP=wallabag
 GIT_VERSION=$VERSION
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
@@ -8,7 +8,7 @@ DEBIAN_VERSION_CODENAME=bookworm
 IMAGE_SIZE=4
 DEPOT=https://github.com/wallabag/wallabag.git
 
-PACKAGE_DEPENDENCY="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 make yarn nodejs"
+PACKAGE_DEPENDENCY="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 make yarn nodejs"
 
 main(){
         base_package_upgrade
@@ -22,29 +22,23 @@ envinit() {
 	configure_depot_yarn
 	configure_depot_nodejs 18
 	install_package_dependency
-	cd /opt/
+	install_composer
-	wget https://getcomposer.org/download/2.5.8/composer.phar -O /opt/composer.phar
 }
 
 build() {
 	cd /tmp/${APP}
-	COMPOSER_ALLOW_SUPERUSER=1 SYMFONY_ENV=prod php /opt/composer.phar install --no-dev -o --prefer-dist -n --no-scripts
+	COMPOSER_ALLOW_SUPERUSER=1 SYMFONY_ENV=prod php /usr/bin/composer.phar install --no-dev -o --prefer-dist -n --no-scripts
 	ENV=PROD make build
 }
 
 makedeb(){
 	PATH_DEB=/tmp/src/rootfs
 
-	cp -fr /tmp/${APP}/app ${PATH_DEB}/usr/share/wallabag/app
+	cp -fr /tmp/${APP}/* ${PATH_DEB}/usr/share/wallabag/
-	cp -fr /tmp/${APP}/src ${PATH_DEB}/usr/share/wallabag/src
+	rm -fr ${PATH_DEB}/usr/share/wallabag/node_modules
-	cp -fr /tmp/${APP}/vendor ${PATH_DEB}/usr/share/wallabag/vendor
+	mv ${PATH_DEB}/usr/share/wallabag/data ${PATH_DEB}/var/lib/wallabag/data
-	cp -fr /tmp/${APP}/web ${PATH_DEB}/usr/share/wallabag/web
+	mv ${PATH_DEB}/usr/share/wallabag/var ${PATH_DEB}/var/lib/wallabag/var
-	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/${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/${APP}/data ${PATH_DEB}/usr/share/wallabag/data