Compare commits

..

No commits in common. "daa30878e7d08a999a83c1b0c78105b6b133a690" and "a92a6a87383c0283340a556c790e0fcc7d262abd" have entirely different histories.

6 changed files with 11 additions and 33 deletions

View File

@ -90,15 +90,10 @@ debmaker_run(){
[ -f cache/${APP} ] || zdebmaker_createAppOS [ -f cache/${APP} ] || zdebmaker_createAppOS
zdebmaker_inject zdebmaker_inject
debmaker_mount_proc_sys cache/${APP} ${MOUNT_PATH}/${APP}/ debmaker_mount_proc_sys cache/${APP} ${MOUNT_PATH}/${APP}/
if [ "$STEP" == "" ]
then
sudo chroot ${MOUNT_PATH}/${APP}/ /tmp/src/exec_in_chroot.sh main
else
for CURRENT_STEP in ${STEP} for CURRENT_STEP in ${STEP}
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
fi
rm -fr dist/${APP}* rm -fr dist/${APP}*
find ${MOUNT_PATH}/${APP}/tmp/dist/ -name *.deb -exec cp -v {} dist/ \; 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

@ -9,13 +9,7 @@ DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=5 IMAGE_SIZE=5
PACKAGE_DEPENDENCY="nodejs yarn maven openjdk-11-jdk" PACKAGE_DEPENDENCY="nodejs yarn maven openjdk-11-jdk"
main(){ STEP="base_package_upgrade envinit get_git_source build makedeb"
base_package_upgrade
envinit
get_git_source
build
makedeb
}
envinit() { envinit() {
configure_depot_yarn configure_depot_yarn
@ -37,10 +31,6 @@ makedeb(){
mv ${PATH_DEB}/usr/share/cloudbeaver/workspace ${PATH_DEB}/var/lib/cloudbeaver/ mv ${PATH_DEB}/usr/share/cloudbeaver/workspace ${PATH_DEB}/var/lib/cloudbeaver/
ln -s /var/lib/cloudbeaver/workspace ${PATH_DEB}/usr/share/cloudbeaver/workspace ln -s /var/lib/cloudbeaver/workspace ${PATH_DEB}/usr/share/cloudbeaver/workspace
mkdir ${PATH_DEB}/etc/
mv ${PATH_DEB}/usr/share/cloudbeaver/conf ${PATH_DEB}/etc/cloudbeaver/
ln -s /etc/cloudbeaver ${PATH_DEB}/usr/share/cloudbeaver/conf
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,5 +1 @@
/etc/cloudbeaver/cloudbeaver.conf /etc/default/cloudbeaver
/etc/cloudbeaver/logback.xml
/etc/cloudbeaver/initial-data-sources.conf
/etc/cloudbeaver/initial-data.conf
/etc/cloudbeaver/product.conf

View File

@ -3,6 +3,5 @@ Version: %VERSION%
Section: base Section: base
Priority: optional Priority: optional
Architecture: all Architecture: all
Depends: default-jre-headless
Maintainer: Thomas Legay <thomas@lgy.fr> Maintainer: Thomas Legay <thomas@lgy.fr>
Description: cloudbeaver Description: cloudbeaver

View File

@ -0,0 +1 @@
CLOUDBEAVER_HOME=/usr/share/cloudbeaver/

View File

@ -2,14 +2,11 @@
Description=cloudbeaver Description=cloudbeaver
[Service] [Service]
Type=exec
User=cloudbeaver User=cloudbeaver
Group=cloudbeaver EnvironmentFile=-/etc/default/cloudbeaver
ExecStart=/usr/share/cloudbeaver/run-server.sh ExecStart=/usr/share/cloudbeaver/run-server.sh
WorkingDirectory=/usr/share/cloudbeaver WorkingDirectory=/var/lib/cloudbeaver
PrivateTmp=true
PrivateDevices=true
ProtectHome=true
ProtectSystem=strict
Restart=on-failure Restart=on-failure
RestartSec=30s RestartSec=30s
ReadWritePaths=/var/lib/cloudbeaver ReadWritePaths=/var/lib/cloudbeaver