fix Dockerfile

jerry-goodman · jerry-goodman · commit a4d25c3e671a · 2023-01-14T17:12:10.000+08:00
diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile
@@ -13,6 +13,12 @@ ARG REACT_APP_ENV=production
 ARG REACT_APP_EDITION=community
 RUN yarn build
 
+FROM node:slim AS build-node
+COPY ./server/node-service /openblocks-node
+WORKDIR /openblocks-node
+RUN yarn --immutable
+RUN yarn build
+
 FROM openjdk:17-slim AS jre-build
 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 \
           --output /build/jre \
@@ -70,18 +76,15 @@ ARG PLUGIN_JARS=/openblocks-server/openblocks-plugins/*/target/*.jar
 
 RUN mkdir -p /openblocks /openblocks/plugins /var/www/openblocks /env2
 
-COPY --from=build-server ${JAR_FILE} /openblocks/server/server.jar
-COPY --from=build-server ${PLUGIN_JARS} /openblocks/server/plugins/
-
+COPY --from=build-server ${JAR_FILE} /openblocks/server/api-service/server.jar
+COPY --from=build-server ${PLUGIN_JARS} /openblocks/server/api-service/plugins/
 
 # copy tace-fe build
 COPY --from=build-client /openblocks-client/packages/openblocks/build/ /openblocks/client/
 
 # copy node-service
-COPY ./server/node-service/ /node-service
-COPY ./deploy/docker/scripts/start-node-service.sh /node-service/start-node-service.sh
-
-RUN cd /node-service && yarn install && yarn build
+COPY --from=build-node /openblocks-node /openblocks/server/node-service
+COPY ./deploy/docker/scripts/start-node-service.sh /openblocks/server/node-service/start-node-service.sh
 
 # copy nginx conf
 COPY ./deploy/docker/templates/nginx/* /openblocks/nginx/
diff --git a/deploy/docker/templates/supervisord/backend.conf b/deploy/docker/templates/supervisord/backend.conf
@@ -1,5 +1,5 @@
 [program:backend]
-directory=/openblocks/server
+directory=/openblocks/server/api-service
 # Ref -Dlog4j2.formatMsgNoLookups=true https://spring.io/blog/2021/12/10/log4j2-vulnerability-and-spring-boot
 command=/app/bin/java -Djava.security.egd="file:/dev/./urandom" -Dlog4j2.formatMsgNoLookups=true -Dspring.config.location="file:///openblocks/env/application.yml,file:///openblocks-stacks/configuration/application-selfhost.yml" -jar server.jar
 priority=15
diff --git a/deploy/docker/templates/supervisord/node.conf b/deploy/docker/templates/supervisord/node.conf
@@ -1,6 +1,6 @@
 [program:node]
-directory=/node-service
-command=/node-service/start-node-service.sh
+directory=/openblocks/server/node-service
+command=/openblocks/server/node-service/start-node-service.sh
 
 priority=12
 autostart=true
