Skip to content

Commit b7c4928

Browse files
committed
new: simplify api service build
1 parent 2b20d3f commit b7c4928

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

deploy/docker/Dockerfile

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
##
2-
## Create custom JRE for running Lowcoder server application
3-
##
4-
FROM eclipse-temurin:17-jdk-jammy AS jre-build
5-
RUN jlink --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.management.rmi,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.se,java.security.jgss,java.security.sasl,java.smartcardio,java.sql,java.sql.rowset,java.transaction.xa,java.xml,java.xml.crypto,jdk.accessibility,jdk.charsets,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.dynalink,jdk.httpserver,jdk.incubator.foreign,jdk.incubator.vector,jdk.internal.vm.ci,jdk.jdwp.agent,jdk.jfr,jdk.jsobject,jdk.localedata,jdk.management,jdk.management.agent,jdk.management.jfr,jdk.naming.dns,jdk.naming.rmi,jdk.net,jdk.nio.mapmode,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.xml.dom,jdk.zipfs,jdk.attach \
6-
--output /build/jre \
7-
--no-man-pages \
8-
--no-header-files \
9-
--compress=2
10-
111
##
122
## Build Lowcoder api-service application
133
##
@@ -23,9 +13,6 @@ RUN mkdir -p /lowcoder/api-service/plugins /lowcoder/api-service/config /lowcode
2313
ARG JAR_FILE=/lowcoder-server/lowcoder-server/target/lowcoder-server-*.jar
2414
ARG PLUGIN_JARS=/lowcoder-server/lowcoder-plugins/*/target/*.jar
2515

26-
# Copy Java runtime for running server
27-
COPY --from=jre-build /build/jre /lowcoder/api-service/jre
28-
2916
# Copy lowcoder server application and plugins
3017
RUN cp ${JAR_FILE} /lowcoder/api-service/server.jar \
3118
&& cp ${PLUGIN_JARS} /lowcoder/api-service/plugins/
@@ -45,7 +32,7 @@ RUN chmod +x /lowcoder/api-service/*.sh
4532
## To create a separate image out of it, build it with:
4633
## DOCKER_BUILDKIT=1 docker build -f deploy/docker/Dockerfile -t lowcoderorg/lowcoder-ce-api-service --target lowcoder-ce-api-service .
4734
##
48-
FROM ubuntu:jammy as lowcoder-ce-api-service
35+
FROM eclipse-temurin:17-jammy as lowcoder-ce-api-service
4936
LABEL maintainer="lowcoder"
5037

5138
RUN apt-get update && apt-get install -y --no-install-recommends gosu \
@@ -207,6 +194,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal
207194
supervisor \
208195
gosu \
209196
nodejs \
197+
openjdk-17-jdk-headless \
210198
&& npm install -g yarn \
211199
&& rm -rf /var/cache/apt/lists
212200

deploy/docker/api-service/entrypoint.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ export GROUP_ID="${PGID:=9001}"
99
echo "Initializing api-service..."
1010
/lowcoder/api-service/init.sh
1111

12+
if [ -z $JAVA_HOME ]; then
13+
JAVA_HOME=`dirname $(dirname $(readlink -f $(which javac)))`
14+
fi;
1215
APP_JAR="${APP_JAR:=/lowcoder/api-service/server.jar}"
13-
JAVA_HOME=/lowcoder/api-service/jre
1416
JAVA_OPTS="${JAVA_OPTS:=}"
1517
CUSTOM_APP_PROPERTIES="${APP_PROPERTIES}"
1618
CONTEXT_PATH=${CONTEXT_PATH:=/}

0 commit comments

Comments
 (0)