From cf30d5a70e51eaafc61cf39b3e3618dbd6676e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Thu, 14 Feb 2019 11:34:39 +0800 Subject: [PATCH] =?UTF-8?q?!21=20=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4=20Me?= =?UTF-8?q?rge=20pull=20request=20!21=20from=20=E6=89=93=E7=A0=B4=E6=B2=99?= =?UTF-8?q?=E9=94=85=E6=B2=A1=E6=9C=89=E5=BA=95/master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/Dockerfile | 2 +- docker-compose.yml | 2 +- pig-upms/pig-upms-biz/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 docker-compose.yml diff --git a/db/Dockerfile b/db/Dockerfile index 39a787c1..3affe8ff 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER lengleng(wangiegie@gmail.com) RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -COPY ./doc/db/pig.sql /docker-entrypoint-initdb.d +COPY ./db/pig.sql /docker-entrypoint-initdb.d diff --git a/docker-compose.yml b/docker-compose.yml old mode 100755 new mode 100644 index 217630b4..ba7b006d --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: pig-mysql: build: context: ./ - dockerfile: ./doc/db/Dockerfile + dockerfile: ./db/Dockerfile environment: MYSQL_ROOT_PASSWORD: root restart: always diff --git a/pig-upms/pig-upms-biz/Dockerfile b/pig-upms/pig-upms-biz/Dockerfile index cff15405..f42c8b4e 100644 --- a/pig-upms/pig-upms-biz/Dockerfile +++ b/pig-upms/pig-upms-biz/Dockerfile @@ -10,6 +10,6 @@ WORKDIR /pigx-upms EXPOSE 4000 -ADD ./pigx-upms/pigx-upms-biz/target/pigx-upms-biz.jar ./ +ADD ./pig-upms/pig-upms-biz/target/pig-upms-biz.jar ./ CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-upms-biz.jar -- GitLab