Merge remote-tracking branch 'origin/prod-allinone' into prod-allinone

LoveDoLove-Forked-Projects · Jun 1, 2023 · 1ef346c · 1ef346c
2 parents d95cdf0 + fe54378
commit 1ef346c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile-allinone b/Dockerfile-allinone
@@ -16,7 +16,7 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 RUN apk add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo "Asia/Shanghai" > /etc/timezone  && apk del tzdata
 ADD ./target/memo-0.0.1-SNAPSHOT.jar /app/memo-0.0.1-SNAPSHOT.jar
 ADD ./target/classes/*.properties /app/
-COPY --from=front /app/mblog-front/dist /opt/mblog/static
+COPY --from=front /app/mblog-front/dist /app/static
 ENV JAVA_OPTS="-Xms512m -Xmx512m"
 ENV DB_TYPE=""
 CMD java $JAVA_OPTS -jar /app/memo-0.0.1-SNAPSHOT.jar --spring.config.location=/app/application$DB_TYPE.properties
diff --git a/src/main/resources/application-sqlite.properties b/src/main/resources/application-sqlite.properties
@@ -22,4 +22,4 @@ springdoc.swagger-ui.path=/api.html
 springdoc.api-docs.enabled=${ENABLE_SWAGGER:false}
 springdoc.swagger-ui.enabled=${ENABLE_SWAGGER:false}
 springdoc.packagesToScan=st.coo.memo.controller
-spring.web.resources.static-locations=file:/opt/${spring.application.name}/static
+spring.web.resources.static-locations=file:/app/static
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -22,4 +22,4 @@ springdoc.swagger-ui.path=/api.html
 springdoc.api-docs.enabled=${ENABLE_SWAGGER:false}
 springdoc.swagger-ui.enabled=${ENABLE_SWAGGER:false}
 springdoc.packagesToScan=st.coo.memo.controller
-spring.web.resources.static-locations=file:/opt/${spring.application.name}/static
+spring.web.resources.static-locations=file:/app/static