Merge branch 'dev' into fix/css-issues

Author: FalkWolsky

README.md

@@ -32,7 +32,7 @@ Lowcoder wants to take a step forward. More specifically, Lowcoder is:
 - The only platform where you can build your own Meeting Tool - like Teams, Zoom or Google Meets, - just in the Lowcode way.
 
 ## 🪄 Features
-- **Visual UI builder** with 50+ built-in components. Save 90% of time to build apps.
+- **Visual UI builder** with 70+ built-in components. Save 90% of time to build apps.
 - **Modules** for reusable (!) component sets in the UI builder.
 - **Embed Lowcoder Apps as native parts of any Website** instead of iFrame (!). [Demo](https://github.com/lowcoder-org/lowcoder-sdk-demo)
 - **Video Meeting Components** to create your own individual Web-Meeting tool.
@@ -87,6 +87,8 @@ And we mean it... Day by day!
 ## 💻 Deployment Options
 [![Deploy to AWS using Stitch](https://img.shields.io/badge/deploy_with-Stitch-%23E369F7?logo=amazonaws&color=%23E369F7)](https://deploy.stitch.tech/lowcoder/lowcoder)
 
+[![Deploy in minutes on Elest.io](https://raw.githubusercontent.com/elestio-examples/element/main/deploy-on-elestio.png)](https://elest.io/open-source/lowcoder)
+
 You can access Lowcoder from [cloud-hosted version](https://app.lowcoder.cloud/) at any time, or use the following resources for self-host Lowcoder on different platforms:
 - [Docker](https://docs.lowcoder.cloud/lowcoder-documentation/setup-and-run/self-hosting)
 

deploy/docker/Dockerfile

@@ -37,11 +37,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends gosu \
 COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder/api-service /lowcoder/api-service
 
 # Copy lowcoder api service app, dependencies and libs
-COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/app /lowcoder/api-service/app
-COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/dependencies /lowcoder/api-service/dependencies
-COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/libs /lowcoder/api-service/libs
-COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/plugins /lowcoder/api-service/plugins
-COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/set-classpath.sh /lowcoder/api-service/set-classpath.sh
+COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/lowcoder-server/target/lowcoder-api-service-bin/lowcoder-api-service.jar /lowcoder/api-service/lowcoder-api-service.jar
+COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/lowcoder-server/target/lowcoder-api-service-bin/libs /lowcoder/api-service/libs
+COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/lowcoder-server/target/lowcoder-api-service-bin/plugins /lowcoder/api-service/plugins
 
 EXPOSE 8080
 CMD [ "/bin/bash" , "/lowcoder/api-service/entrypoint.sh" ]

deploy/docker/api-service/entrypoint.sh

@@ -12,7 +12,7 @@ echo "Initializing api-service..."
 if [ -z $JAVA_HOME ]; then
     JAVA_HOME=`dirname $(dirname $(readlink -f $(which javac)))`
 fi;
-APP_JAR="${APP_JAR:=/lowcoder/api-service/server.jar}"
+APP_JAR="${APP_JAR:=/lowcoder/api-service/lowcoder-api-service.jar}"
 JAVA_OPTS="${JAVA_OPTS:=}"
 CUSTOM_APP_PROPERTIES="${APP_PROPERTIES}"
 CONTEXT_PATH=${CONTEXT_PATH:=/}
@@ -27,7 +27,6 @@ ${JAVA_HOME}/bin/java -version
 echo
 
 cd /lowcoder/api-service
-source set-classpath.sh
 
 exec gosu ${USER_ID}:${GROUP_ID} ${JAVA_HOME}/bin/java \
   -Djava.util.prefs.userRoot=/tmp \
@@ -36,7 +35,7 @@ exec gosu ${USER_ID}:${GROUP_ID} ${JAVA_HOME}/bin/java \
   -Dlog4j2.formatMsgNoLookups=true \
   -Dspring.config.location="file:///lowcoder/api-service/config/application.yaml" \
   --add-opens java.base/java.nio=ALL-UNNAMED \
-  -cp "${LOWCODER_CLASSPATH:=.}" \
   ${JAVA_OPTS} \
-  org.lowcoder.api.ServerApplication --spring.webflux.base-path=${CONTEXT_PATH} ${CUSTOM_APP_PROPERTIES}
+  -Dpf4j.pluginsDir=/lowcoder/api-service/plugins \
+  -jar ${APP_JAR} --spring.webflux.base-path=${CONTEXT_PATH} ${CUSTOM_APP_PROPERTIES}
 

server/api-service/distribution/pom.xml

@@ -0,0 +1,6 @@
+# Copy the Qualifier annotation from the instance variables to the constructor
+# see https://github.com/rzwitserloot/lombok/issues/745
+lombok.copyableAnnotations += org.springframework.beans.factory.annotation.Qualifier
+lombok.copyableAnnotations += org.springframework.beans.factory.annotation.Value
+lombok.copyableAnnotations += org.springframework.context.annotation.Lazy
+