소스 검색

dockerfile: update 3

Yi 6 달 전
부모
커밋
f8cc3901c9
2개의 변경된 파일12개의 추가작업 그리고 15개의 파일을 삭제
  1. 2 5
      Dockerfile
  2. 10 10
      docker-compose.yml

+ 2 - 5
Dockerfile

@@ -24,10 +24,7 @@ WORKDIR /app/kpt-pasture
 COPY --from=0 /app/kpt-pasture/config/ /app/kpt-pasture/config/
 COPY --from=0  /app/kpt-pasture/bin/kptPasture /app/kpt-pasture/kptPasture
 
-RUN ls -l /app/kpt-pasture &&  RUN /app/kpt-pasture/bin
-RUN ls -l /app/kpt-pasture/config
-
 EXPOSE 8090
-VOLUME ["/app/kpt-pasture/logger","/app/kpt-pasture/bin/config","/app/kpt-pasture/files"]
+VOLUME ["/app/kpt-pasture/logger","/app/kpt-pasture/config","/app/kpt-pasture/files"]
 
-CMD ["/app/kpt-pasture/bin/kptPasture","http"]
+CMD ["/app/kpt-pasture/kptPasture","http"]

+ 10 - 10
docker-compose.yml

@@ -1,31 +1,31 @@
 version : '3'
 services:
-  kpt-dtm-crontab:
+  kpt-pasture-crontab:
     privileged: true
     container_name: xdmy001_kpt_pasture_crontab
     restart: always
     image: registry.cn-hangzhou.aliyuncs.com/kpt-event/kpt-pasture:test
     volumes:
-      - /var/logger/kpt-dtm/:/app/kpt-dtm/logger
+      - /var/logger/kpt-pasture/:/app/kpt-pasture/logger
       - /etc/localtime:/etc/localtime
       - /data/docker-compose/kpt-pasture/config:/app/kpt-pasture/config
     environment:
       - APP_ENVIRONMENT=production
-      - DTM_WORK_DIR=/app/kpt-pasture/bin
+      - PASTURE_WORK_DIR=/app/kpt-pasture
     ports:
       - "8091:8090"
-    command: [ "/app/kpt-pasture/bin/kptPasture","crontab" ]
-  kpt-dtm-http:
+    command: [ "/app/kpt-pasture/kptPasture","crontab" ]
+  kpt-pasture-http:
     privileged: true
     container_name: xdmy001_kpt_pasture_http
     restart: always
-    image: registry.cn-hangzhou.aliyuncs.com/kpt-event/kpt-dtm:test
+    image: registry.cn-hangzhou.aliyuncs.com/kpt-event/kpt-pasture:test
     volumes:
-      - /var/logger/kpt-dtm/:/app/kpt-dtm/logger
+      - /var/logger/kpt-pasture/:/app/kpt-pasture/logger
       - /etc/localtime:/etc/localtime
-      - /data/docker-compose/kpt-dtm/config:/app/kpt-dtm/config
+      - /data/docker-compose/kpt-pasture/config:/app/kpt-pasture/config
       - /data/docker-compose/kpt-pasture/files:/app/kpt-pasture/files
     environment:
       - APP_ENVIRONMENT=production
-      - DTM_WORK_DIR=/app/kpt-pasture/bin
-    command: [ "/app/kpt-pasture/bin/kptPasture","http" ]
+      - PASTURE_WORK_DIR=/app/kpt-pasture
+    command: [ "/app/kpt-pasture/kptPasture","http" ]