mac 2 жил өмнө
parent
commit
3dc85faad3

+ 1 - 2
.drone.yml

@@ -32,8 +32,7 @@ steps:
         path: /usr/share/maven/conf/
     commands: # 执行命令
       - pwd # 查看当前目录
-      - mvn dependency:resolve
-      - mvn -s /usr/share/maven/conf/settings.xml -Dmaven.repo.local=/usr/share/maven/repo  clean install -Dmaven.test.skip=true -P dev
+      - mvn  clean package -Dmaven.test.skip=true -P dev
 
       - pwd ./ # 查看当前目录
       # - cp -a ./package.json /nodeServer1 && cp -a ./bootstrap.js /nodeServer1

+ 0 - 28
docker-compose.yml

@@ -1,33 +1,5 @@
 version: '3'
 services:
-  weba_mvc:
-    # 增加安装libgdiplus
-    # image: alpine
-
-    build:
-      context: ./dockfile
-      dockerfile: java17.Dockfile
-    container_name: javacontainer
-    platform: linux/arm64/v8
-    # restart: always
-    # depends_on:
-    #   - db
-    # environment:
-    #   - ASPNETCORE_ENVIRONMENT=Production
-    #   - 'TZ=Asia/Shanghai'
-    networks:
-      - abnet
-    #使用links后在站点配置文件中直接使用db可以访问到mysql
-    # links:
-    #   - db
-    # working_dir: /www/weba/
-    working_dir: /www/adminap/
-    volumes:
-      - '/Users/abpasser/AB/ABGit/docker-compose/ABServer-Java17-Tengine-Mysql5.7-Redis/webroot/weba/:/www/weba/'
-      - '/Users/abpasser/AB/ABGit/docker-compose/ABServer-Java17-Tengine-Mysql5.7-Redis/webroot/adminap/:/www/adminap/'
-    #   - '/home/ABServer/weblog/weba/err.log:/var/log/website.err.log'
-    # entrypoint: ["java","-Djava.security.egd=file:/dev/./urandom", "-Dspring.config.location=application.yml", "-jar", "adminap-0.0.1.jar"]
-    entrypoint: [ "mvn","dependency:go-offline","clean","package","spring-boot:repackage" ]
 
   kxs-mysql:
     build:

+ 0 - 1
kxs-common/kxs-common-core/pom.xml

@@ -54,5 +54,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-
 </project>