Skip to content

Commit 0d1b0b9

Browse files
committed
fix(cloudbeaver): build error miss jar
2 parents 195e64d + a5bb8f1 commit 0d1b0b9

1 file changed

Lines changed: 21 additions & 1 deletion

File tree

stacks/cloudbeaver/build.sh

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# Implement build function
77
function build() {
88
# ref : https://github.com/dbeaver/cloudbeaver/wiki/Build-and-deploy
9+
<<<<<<< HEAD
910
# git tag --sorted=-creatordate --merged remotes/origin/release_23_2_5
1011
cd /opt/drycc/
1112
. init-stack
@@ -14,12 +15,20 @@ function build() {
1415
DBEAVER_VERSION=23.2.5 #CLOUD_VERSION 23.1.4
1516
install-stack java ${JAVA_VERSION}
1617
install-packages maven gnupg gnupg2 git
18+
=======
19+
cd /opt/drycc/
20+
. init-stack
21+
NODE_VERSION=16.20.1
22+
DBEAVER_VERSION=23.2.5
23+
install-packages openjdk-17-jdk maven gnupg gnupg2 git
24+
>>>>>>> a5bb8f1c00ad06e2e19aaba2b69d797d6da12229
1725
java --version && mvn --version
1826
curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
1927
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
2028
curl -sL https://deb.nodesource.com/setup_14.x | bash -
2129
install-packages yarn
2230
yarn --version
31+
<<<<<<< HEAD
2332
install-stack node ${NODE_VERSION}
2433
export PATH=${PATH}:/opt/drycc/node/bin
2534
git clone https://github.com/dbeaver/dbeaver.git
@@ -33,4 +42,15 @@ function build() {
3342

3443
}
3544
# call build stack
36-
build-stack "${1}"
45+
build-stack "${1}"
46+
=======
47+
install-stack node $NODE_VERSION
48+
export PATH=$PATH:/opt/drycc/node/bin
49+
git clone https://github.com/dbeaver/dbeaver.git && cd dbeaver && git checkout $DBEAVER_VERSION
50+
cd ..
51+
git clone https://github.com/dbeaver/cloudbeaver.git && cd cloudbeaver/ && git checkout $STACK_VERSION
52+
cd deploy && sh build.sh && cp -r cloudbeaver ${DATA_DIR}
53+
}
54+
# call build stack
55+
build-stack "${1}"
56+
>>>>>>> a5bb8f1c00ad06e2e19aaba2b69d797d6da12229

0 commit comments

Comments
 (0)