From 03b2a2e3452fb0df9f18832c282b56071ee157b8 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Tue, 28 Jun 2022 17:30:45 +0800 Subject: [PATCH] zh --- .drone.yml | 4 ---- Dockerfile.drone | 2 +- src/main/resources/mapper/ReferenceMapper.xml | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4a5ef5c..5578537 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,10 +22,6 @@ steps: - mkdir /root/.m2 - cp /usr/share/maven/ref/settings-docker.xml /root/.m2/settings.xml - sed -i 's/\\/usr\\/share\\/maven\\/ref\\/repository/\\/drone\\/src\\/maven/g' /root/.m2/settings.xml - - apt-get update - - apt-get install yum - - yum install fontconfig - - RUN apk add --update font-adobe-100dpi ttf-dejavu fontconfig - mvn package - name: rebuild-cache image: meltwater/drone-cache diff --git a/Dockerfile.drone b/Dockerfile.drone index 71fc91a..083f29f 100644 --- a/Dockerfile.drone +++ b/Dockerfile.drone @@ -1,4 +1,4 @@ -FROM openjdk:8-jdk-alpine +FROM harbor.oa00.com/library/openjdk:8-jdk-alpine # 从编译阶段的中拷贝编译结果到当前镜像中 COPY ./target/project0512-0.0.1-SNAPSHOT.jar /work/project0512-0.0.1-SNAPSHOT.jar WORKDIR /work diff --git a/src/main/resources/mapper/ReferenceMapper.xml b/src/main/resources/mapper/ReferenceMapper.xml index 2d2bca8..5c58f15 100644 --- a/src/main/resources/mapper/ReferenceMapper.xml +++ b/src/main/resources/mapper/ReferenceMapper.xml @@ -53,6 +53,7 @@ +