Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
52fcc671
Commit
52fcc671
authored
Jun 25, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.12-解决社保打包问题——先还原
parent
58fd1e88
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
81 deletions
+22
-81
Dockerfile
yifu-social/yifu-social-biz/Dockerfile
+3
-5
pom.xml
yifu-social/yifu-social-biz/pom.xml
+19
-76
No files found.
yifu-social/yifu-social-biz/Dockerfile
View file @
52fcc671
...
@@ -9,14 +9,12 @@ ARG JAR_FILE=target/yifu-social-biz.jar
...
@@ -9,14 +9,12 @@ ARG JAR_FILE=target/yifu-social-biz.jar
COPY
${JAR_FILE} app.jar
COPY
${JAR_FILE} app.jar
## 解决使用excel工具转png docker乱码没有宋体
## 解决使用excel工具转png docker乱码没有宋体
#RUN set -xe && apk --no-cache add fontconfig
#COPY simsun.ttc /usr/share/fonts/
# 使用缓存安装 fontconfig hgw 20250625
# 使用缓存安装 fontconfig hgw 20250625
RUN
--mount
=
type
=
cache,target
=
/var/cache/apk
set
-xe
&&
apk
--no-cache
add fontconfig
#
RUN --mount=type=cache,target=/var/cache/apk set -xe && apk --no-cache add fontconfig
# 添加宋体(仅在 simsun.ttc 变更时重新复制)
RUN
set
-xe
&&
apk
--no-cache
add fontconfig
COPY
simsun.ttc /usr/share/fonts/
COPY
simsun.ttc /usr/share/fonts/
##end
##end
EXPOSE
5002
EXPOSE
5002
...
...
yifu-social/yifu-social-biz/pom.xml
View file @
52fcc671
...
@@ -126,87 +126,30 @@
...
@@ -126,87 +126,30 @@
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
</plugin>
</plugin>
<plugin>
<plugin>
<groupId>
io.fabric8
</groupId>
<groupId>
com.spotify
</groupId>
<artifactId>
docker-maven-plugin
</artifactId>
<artifactId>
docker-maven-plugin
</artifactId>
<version>
0.40.2
</version>
<version>
1.1.0
</version>
<configuration>
<configuration>
<!-- 认证配置 -->
<authConfig>
<settings>
<serverId>
docker-hub
</serverId>
<serverId>
docker-hub
</serverId>
</settings>
</authConfig>
<!-- 镜像配置 -->
<images>
<image>
<!--指定生成的镜像名-->
<!--指定生成的镜像名-->
<name>
${my.hub.host}/${map.group.name}/${project.artifactId}:${project.version}
</name>
<imageName>
${my.hub.host}/${map.group.name}/${project.artifactId}:${project.version}
</imageName>
<dockerDirectory>
${project.basedir}/
</dockerDirectory>
<!-- 构建配置 -->
<!--指定远程 docker api地址-->
<build>
<!--<dockerHost>http://172.16.66.232:2375</dockerHost>-->
<!-- 保持与原目录一致 -->
<!-- 这里是复制 jar 包到 docker 容器指定目录配置-->
<dockerFileDir>
${project.basedir}/
</dockerFileDir>
<resources>
<resource>
<!-- 等效于原resources配置 -->
<targetPath>
/
</targetPath>
<assembly>
<targetDir>
/
</targetDir>
<descriptorRef>
artifact
</descriptorRef>
<inline>
<fileSets>
<fileSet>
<!--jar 包所在的路径 此处配置的 即对应 target 目录-->
<!--jar 包所在的路径 此处配置的 即对应 target 目录-->
<directory>
${project.build.directory}
</directory>
<directory>
${project.build.directory}
</directory>
<includes>
<!-- 需要包含的 jar包 ,这里对应的是 Dockerfile中添加的文件名 -->
<!-- 需要包含的 jar包 ,这里对应的是 Dockerfile中添加的文件名 -->
<include>
${project.build.finalName}.jar
</include>
<include>
${project.build.finalName}.jar
</include>
</includes>
</resource>
<outputDirectory>
/
</outputDirectory>
</resources>
</fileSet>
<forceTags>
true
</forceTags>
</fileSets>
</inline>
</assembly>
<!-- 强制覆盖标签 -->
<tags>
<tag>
${project.version}
</tag>
</tags>
</build>
<!-- 推送配置 -->
<push>
<enabled>
true
</enabled>
</push>
</image>
</images>
<!-- 可选:保留原Docker主机配置 -->
<!-- <dockerHost>http://172.16.66.232:2375</dockerHost> -->
</configuration>
</configuration>
<!-- 绑定到Maven生命周期 -->
<executions>
<execution>
<id>
build-image
</id>
<phase>
package
</phase>
<goals>
<goal>
build
</goal>
</goals>
</execution>
<execution>
<id>
push-image
</id>
<phase>
deploy
</phase>
<goals>
<goal>
push
</goal>
</goals>
</execution>
</executions>
</plugin>
</plugin>
</plugins>
</plugins>
<resources>
<resources>
<resource>
<resource>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment