diff --git a/README.MD b/README.MD index bda6ece..95465dd 100644 --- a/README.MD +++ b/README.MD @@ -58,7 +58,6 @@ To enter in temporary filesystem - [mautrix-syncproxy and mautrix-wsproxy](./ressources/mautrix-syncproxy) - [mautrix-whatsapp](./ressources/mautrix-whatsapp) - [metabase](./ressources/metabase) - - [minio](./ressources/minio) - [phpbb](./ressources/phpbb) - [roundcubemail](./ressources/roundcubemail) - [rss-bridge](./ressources/rss-bridge) diff --git a/lib/exec_in_chroot.sh b/lib/exec_in_chroot.sh index 7d84032..e7c46a8 100755 --- a/lib/exec_in_chroot.sh +++ b/lib/exec_in_chroot.sh @@ -36,10 +36,10 @@ configure_depot_nodejs() { } install_go() { - GO_VERSION=1.19.2 + GO_VERSION=1.19 [ ! "$1" == "" ] && GO_VERSION=$1 PATH=$PATH:/usr/local/go/bin - if [ ! "$(go version)" == "go version go${GO_VERSION} linux/amd64" ] ; + if [ ! "$(go version)" == "go version go${GO_VERSION} linux/amd64" ] ; then rm -rvf /usr/local/go/ wget -qO - https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xz diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker index f927ceb..9bc95a6 100755 --- a/ressources/adguardhome/debmaker +++ b/ressources/adguardhome/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.108.0-b.18 +VERSION=0.108.0-b.16 APP=adguardhome DEPOT=https://github.com/AdguardTeam/AdGuardHome.git GIT_VERSION=v${VERSION} @@ -9,16 +9,7 @@ DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=4 PACKAGE_DEPENDENCY="build-essential nodejs yarn" -main(){ - base_package_upgrade - configure_depot_yarn - configure_depot_nodejs - install_package_dependency - install_go - get_git_source - build - makedeb -} +STEP="base_package_upgrade configure_depot_yarn configure_depot_nodejs install_package_dependency install_go get_git_source build makedeb" build() { cd /tmp/${APP} diff --git a/ressources/authelia/debmaker b/ressources/authelia/debmaker index 1e9dc00..b00c61e 100755 --- a/ressources/authelia/debmaker +++ b/ressources/authelia/debmaker @@ -7,19 +7,12 @@ GIT_VERSION=v${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=6 -PACKAGE_DEPENDENCY="build-essential nodejs" -main(){ - base_package_upgrade - envinit - get_git_source - build - makedeb -} +STEP="base_package_upgrade envinit get_git_source build makedeb" envinit() { configure_depot_nodejs - install_package_dependency + apt install -y --no-install-recommends build-essential nodejs install_go wget -qO - https://get.pnpm.io/install.sh | sh - } diff --git a/ressources/bitwarden-desktop/debmaker b/ressources/bitwarden-desktop/debmaker index ec66c99..bcd3f1d 100755 --- a/ressources/bitwarden-desktop/debmaker +++ b/ressources/bitwarden-desktop/debmaker @@ -27,6 +27,8 @@ build() { electron-builder --linux dir --x64 -p never } + + makedeb(){ PATH_DEB=/tmp/src/rootfs diff --git a/ressources/budibase/debmaker b/ressources/budibase/debmaker index 1890a3e..7d35179 100755 --- a/ressources/budibase/debmaker +++ b/ressources/budibase/debmaker @@ -25,9 +25,8 @@ envinit() { build() { cd /tmp/${APP} - yarn - yarn bootstrap - yarn build + yarn install + yarn dist } makedeb(){ diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker index ac674b0..b6d508e 100755 --- a/ressources/element-web/debmaker +++ b/ressources/element-web/debmaker @@ -7,20 +7,13 @@ GIT_VERSION=v${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=4 -PACKAGE_DEPENDENCY="yarn nodejs" -main(){ - base_package_upgrade - envinit - get_git_source - build - makedeb -} +STEP="base_package_upgrade envinit get_git_source build makedeb" envinit() { configure_depot_yarn configure_depot_nodejs - install_package_dependency + apt install -y --no-install-recommends yarn nodejs } build() { @@ -34,7 +27,6 @@ makedeb(){ tar -zxf /tmp/${APP}/dist/element-${GIT_VERSION}.tar.gz --strip-components=1 -C ${PATH_DEB}/usr/share/element-web/ cp /tmp/${APP}/config.sample.json ${PATH_DEB}/etc/element-web/config.json - sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist } diff --git a/ressources/joplin-server/debmaker b/ressources/joplin-server/debmaker index 85c6a2b..6cf4c73 100755 --- a/ressources/joplin-server/debmaker +++ b/ressources/joplin-server/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.9.1 +VERSION=2.7.4 APP=joplin-server GIT_VERSION=server-v${VERSION} DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker index 20fce80..853d2c5 100755 --- a/ressources/metabase/debmaker +++ b/ressources/metabase/debmaker @@ -7,7 +7,7 @@ GIT_VERSION=v$VERSION DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=10 -PACKAGE_DEPENDENCY="build-essential default-jdk curl nodejs yarn" +PACKAGE_DEPENDENCY="build-essential openjdk-17-jdk curl nodejs yarn" STEP="base_package_upgrade envinit get_git_source build makedeb" diff --git a/ressources/minio/README.MD b/ressources/minio/README.MD deleted file mode 100644 index 73cc1ec..0000000 --- a/ressources/minio/README.MD +++ /dev/null @@ -1,19 +0,0 @@ -#### minio - -##### Information -Site : https://min.io/ - -Source : https://github.com/minio/minio - -##### Install - -```bash -apt install -y wget ca-certificates -wget -qO - https://deb.lgy.fr/install.sh | bash -apt-get update -apt-get install -y minio - -#edit /etc/default/minio - -systemctl enable --now minio -``` diff --git a/ressources/minio/debmaker b/ressources/minio/debmaker deleted file mode 100755 index fa25e3e..0000000 --- a/ressources/minio/debmaker +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -VERSION=RELEASE.2022-10-05T14-58-27Z -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=bullseye -IMAGE_SIZE=4 -PACKAGE_DEPENDENCY="build-essential" - -main(){ - base_package_upgrade - install_package_dependency - install_go - get_git_source - build - makedeb -} - -build() { - cd /tmp/${APP} - make build -} - -makedeb(){ - PATH_DEB=/tmp/src/rootfs - for tmp in $(grep MINIO_ internal/config/constants.go | cut -d '"' -f 2); do echo "#$tmp=" ; done > ${PATH_DEB}/etc/default/minio - cp /tmp/minio/minio ${PATH_DEB}/usr/bin/minio - sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control - fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist -} diff --git a/ressources/minio/rootfs/DEBIAN/changelog b/ressources/minio/rootfs/DEBIAN/changelog deleted file mode 100644 index e69de29..0000000 diff --git a/ressources/minio/rootfs/DEBIAN/conffiles b/ressources/minio/rootfs/DEBIAN/conffiles deleted file mode 100644 index 21864a6..0000000 --- a/ressources/minio/rootfs/DEBIAN/conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/default/minio diff --git a/ressources/minio/rootfs/DEBIAN/control b/ressources/minio/rootfs/DEBIAN/control deleted file mode 100644 index 5f33862..0000000 --- a/ressources/minio/rootfs/DEBIAN/control +++ /dev/null @@ -1,7 +0,0 @@ -Package: minio -Version: %VERSION% -Section: base -Priority: optional -Architecture: amd64 -Maintainer: Thomas Legay -Description: minio diff --git a/ressources/minio/rootfs/DEBIAN/postinst b/ressources/minio/rootfs/DEBIAN/postinst deleted file mode 100755 index 55a0faa..0000000 --- a/ressources/minio/rootfs/DEBIAN/postinst +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -id minio&> /dev/null || useradd minio -r -s /bin/false -md /var/lib/minio -chown minio:minio /var/lib/minio diff --git a/ressources/minio/rootfs/etc/default/.gitkeep b/ressources/minio/rootfs/etc/default/.gitkeep deleted file mode 100644 index bbec228..0000000 Binary files a/ressources/minio/rootfs/etc/default/.gitkeep and /dev/null differ diff --git a/ressources/minio/rootfs/usr/bin/.gitkeep b/ressources/minio/rootfs/usr/bin/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/ressources/minio/rootfs/usr/lib/systemd/system/minio.service b/ressources/minio/rootfs/usr/lib/systemd/system/minio.service deleted file mode 100644 index 75da781..0000000 --- a/ressources/minio/rootfs/usr/lib/systemd/system/minio.service +++ /dev/null @@ -1,23 +0,0 @@ -[Unit] -Description=Minio -ConditionFileIsExecutable=/usr/bin/minio -After=syslog.target network-online.target - -[Service] -User=minio -Group=minio -EnvironmentFile=/etc/default/minio -StartLimitInterval=5 -StartLimitBurst=10 -ExecStart=/usr/bin/minio server /var/lib/minio -PrivateTmp=true -PrivateDevices=true -ProtectHome=true -ProtectSystem=strict -WorkingDirectory=/var/lib//minio/ -ReadWriteDirectories=/var/lib/minio/ -Restart=always -RestartSec=10 - -[Install] -WantedBy=multi-user.target diff --git a/ressources/minio/rootfs/var/lib/minio/.gitkeep b/ressources/minio/rootfs/var/lib/minio/.gitkeep deleted file mode 100644 index e69de29..0000000